gmane.comp.documentfoundation.libreoffice.scm
http://blog.gmane.org/gmane.comp.documentfoundation.libreoffice.scm
hourly
1
1901-01-01T00:00+00:00
Gmane
http://gmane.org/img/gmane-25t.png
http://gmane.org
-
core.git: Branch 'libreoffice-4-1' -l10ntools/source
http://comments.gmane.org/gmane.comp.documentfoundation.libreoffice.scm/27761
<pre> l10ntools/source/stringmerge.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit a3eca34a471e4111877bb35170f90f20463a02c3
Author: Zolnai Tamás <zolnaitamas2000< at >gmail.com>
Date: Sun May 26 08:30:22 2013 +0200
Escape quotes during stringex export
Change-Id: If53afd3743f44bcfffab33122657d14c0f4aba1e
diff --git a/l10ntools/source/stringmerge.cxx b/l10ntools/source/stringmerge.cxx
index 34c978b..9e3fa7a 100644
--- a/l10ntools/source/stringmerge.cxx
+++ b/l10ntools/source/stringmerge.cxx
< at >< at > -71,7 +71,7 < at >< at > void StringParser::Extract( const OString& rPOFile )
xmlChar* pID = xmlGetProp(pCurrent, (const xmlChar*)("name"));
xmlChar* pText = xmlNodeGetContent(pCurrent);
const OString sTemp =
- helper::unEscapeAll(helper::xmlStrToOString( pText ),"\\n""\\t","\n""\t");
+ helper::unEscapeAll(helper::xmlStrToOString( pText ),"\\n""\\t""\\\"""\\\'","\n""\t""\"""\'");
common::writePoEntry(
"Stringex", aPOStream, m_pSource->name, "string",
helper::xmlStrToOString( pID ), OString(), OString(),
< at >< at > -130,7 +130,7 < at >< at > void StringParser::Merge(
{
xmlChar* pText = xmlNodeGetContent(pCurrent);
const OString sOriginText =
- helper::unEscapeAll(helper::xmlStrToOString( pText ),"\\n""\\t","\n""\t");
+ helper::unEscapeAll(helper::xmlStrToOString( pText ),"\\n""\\t""\\\"""\\\'","\n""\t""\"""\'");
xmlFree( pText );
sNewText = MergeEntrys::GetQTZText(aResData, sOriginText);
}
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits< at >lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
</pre>
Zolnai Tamás
2013-05-26T07:21:55
-
core.git: l10ntools/source
http://comments.gmane.org/gmane.comp.documentfoundation.libreoffice.scm/27760
<pre> l10ntools/source/stringmerge.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 1cb50dc6ec75586975c2d4e528953fa8ca33e1f1
Author: Zolnai Tamás <zolnaitamas2000< at >gmail.com>
Date: Sun May 26 08:30:22 2013 +0200
Escape quotes during stringex export
Change-Id: If53afd3743f44bcfffab33122657d14c0f4aba1e
diff --git a/l10ntools/source/stringmerge.cxx b/l10ntools/source/stringmerge.cxx
index 34c978b..9e3fa7a 100644
--- a/l10ntools/source/stringmerge.cxx
+++ b/l10ntools/source/stringmerge.cxx
< at >< at > -71,7 +71,7 < at >< at > void StringParser::Extract( const OString& rPOFile )
xmlChar* pID = xmlGetProp(pCurrent, (const xmlChar*)("name"));
xmlChar* pText = xmlNodeGetContent(pCurrent);
const OString sTemp =
- helper::unEscapeAll(helper::xmlStrToOString( pText ),"\\n""\\t","\n""\t");
+ helper::unEscapeAll(helper::xmlStrToOString( pText ),"\\n""\\t""\\\"""\\\'","\n""\t""\"""\'");
common::writePoEntry(
"Stringex", aPOStream, m_pSource->name, "string",
helper::xmlStrToOString( pID ), OString(), OString(),
< at >< at > -130,7 +130,7 < at >< at > void StringParser::Merge(
{
xmlChar* pText = xmlNodeGetContent(pCurrent);
const OString sOriginText =
- helper::unEscapeAll(helper::xmlStrToOString( pText ),"\\n""\\t","\n""\t");
+ helper::unEscapeAll(helper::xmlStrToOString( pText ),"\\n""\\t""\\\"""\\\'","\n""\t""\"""\'");
xmlFree( pText );
sNewText = MergeEntrys::GetQTZText(aResData, sOriginText);
}
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits< at >lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
</pre>
Zolnai Tamás
2013-05-26T06:58:32
-
core.git: vcl/source
http://comments.gmane.org/gmane.comp.documentfoundation.libreoffice.scm/27759
<pre> vcl/source/gdi/outdev3.cxx | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 5ccdfd28bf05703f2d4b3c0e2040dd6d500eb8d0
Author: Thomas Arnhold <thomas< at >arnhold.org>
Date: Sun May 26 08:20:09 2013 +0200
fix OUString conversion
no idea why hgminchob and hgpminchob are/were not handled this way.
Change-Id: Ia69ab790cc961645a806d971ddc4238d8288b573
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index 393c2fb..1900093 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
< at >< at > -2395,13 +2395,13 < at >< at > ImplDevFontListData* ImplDevFontList::ImplFindByFont( FontSelectPattern& rFSD,
&& aSearchName.startsWithIgnoreAsciiCase( "hg" ) )
{
OUString aBoldName;
- if( aSearchName.equalsIgnoreAsciiCase( "hggothicb" ) )
+ if( aSearchName.startsWithIgnoreAsciiCase( "hggothicb" ) )
aBoldName = OUString("hggothice");
- else if( aSearchName.equalsIgnoreAsciiCase( "hgpgothicb" ) )
+ else if( aSearchName.startsWithIgnoreAsciiCase( "hgpgothicb" ) )
aBoldName = OUString("hgpgothice");
- else if( aSearchName.equalsIgnoreAsciiCase( "hgminchol" ) )
+ else if( aSearchName.startsWithIgnoreAsciiCase( "hgminchol" ) )
aBoldName = OUString("hgminchob");
- else if( aSearchName.equalsIgnoreAsciiCase( "hgpminchol" ) )
+ else if( aSearchName.startsWithIgnoreAsciiCase( "hgpminchol" ) )
aBoldName = OUString("hgpminchob");
else if( aSearchName.equalsIgnoreAsciiCase( "hgminchob" ) )
aBoldName = OUString("hgminchoe");
</pre>
Thomas Arnhold
2013-05-26T06:22:06
-
core.git: vcl/source
http://comments.gmane.org/gmane.comp.documentfoundation.libreoffice.scm/27758
<pre> vcl/source/gdi/outdev3.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3475ca1ad98c77313c177418f350ba8d03d3543d
Author: Sean Young <sean< at >mess.org>
Date: Sat May 25 20:06:15 2013 +0100
fix OUString conversion
This used to be equalsAscii( "hg", 0, 2 ) before conversion.
Fixes 7d1f4cdec307bb1e761bb5dd3d8231bba5833e10
Change-Id: I2cf61d88c79b3ab33c0ee7d077ee65b16053c05c
Reviewed-on: https://gerrit.libreoffice.org/4035
Reviewed-by: Thomas Arnhold <thomas< at >arnhold.org>
Tested-by: Thomas Arnhold <thomas< at >arnhold.org>
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index 4261787..393c2fb 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
< at >< at > -2392,7 +2392,7 < at >< at > ImplDevFontListData* ImplDevFontList::ImplFindByFont( FontSelectPattern& rFSD,
// #114999# special emboldening for Ricoh fonts
// TODO: smarter check for special cases by using PreMatch infrastructure?
if( (rFSD.GetWeight() > WEIGHT_MEDIUM)
- && aSearchName.equalsIgnoreAsciiCase( "hg" ) )
+ && aSearchName.startsWithIgnoreAsciiCase( "hg" ) )
{
OUString aBoldName;
if( aSearchName.equalsIgnoreAsciiCase( "hggothicb" ) )
</pre>
Sean Young
2013-05-26T06:18:48
-
core.git: translations
http://comments.gmane.org/gmane.comp.documentfoundation.libreoffice.scm/27757
<pre> translations | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0bfb9e93346e0bcac1b7e228cc8860eec0295592
Author: Andras Timar <atimar< at >suse.com>
Date: Sat May 25 20:03:16 2013 +0200
Updated core
Project: translations 7db61e0f23b962f97e9246e0a8fb60e47fff0ac9
diff --git a/translations b/translations
index 66306b9..7db61e0 160000
--- a/translations
+++ b/translations
< at >< at > -1 +1 < at >< at >
-Subproject commit 66306b922014c7941665d67e1310a88e3e85f99d
+Subproject commit 7db61e0f23b962f97e9246e0a8fb60e47fff0ac9
</pre>
Andras Timar
2013-05-26T06:05:31
-
core.git: Branch 'aoo/trunk' - 8 commits -basctl/uiconfig chart2/uiconfig dbaccess/uiconfigdefault_images/res forms/source framework/incframework/Library_fwk.mk framework/Library_fwl.mkframework/source framework/uiconfig framework/utilodk/examples offapi/com offapi/type_referenceofficecfg/registry qadevOOo/tests sc/uiconfig sd/uiconfigsfx2/inc sfx2/source starmath/uiconfig svtools/incsvtools/source sw/uiconfig toolkit/inc toolkit/source
http://comments.gmane.org/gmane.comp.documentfoundation.libreoffice.scm/27756
<pre> basctl/uiconfig/basicide/toolbar/standardbar.xml | 2
chart2/uiconfig/toolbar/standardbar.xml | 2
dbaccess/uiconfig/dbapp/toolbar/toolbar.xml | 2
default_images/res/commandimagelist/lc_autopilotmenu.png |binary
default_images/res/commandimagelist/lch_autopilotmenu.png |binary
default_images/res/commandimagelist/sc_autopilotmenu.png |binary
default_images/res/commandimagelist/sch_autopilotmenu.png |binary
forms/source/component/ImageControl.cxx | 8
framework/Library_fwk.mk | 5
framework/Library_fwl.mk | 1
framework/inc/uielement/popupmenucontroller.hxx | 76 -
framework/inc/uielement/popuptoolbarcontroller.hxx | 100 ++
framework/source/register/registerservices.cxx | 6
framework/source/register/registertemp.cxx | 4
framework/source/services/backingwindow.cxx | 197 +---
framework/source/services/backingwindow.hxx | 18
framework/source/uielement/generictoolbarcontroller.cxx | 6
framework/source/uielement/langselectionstatusbarcontroller.cxx | 3
framework/source/uielement/popupmenucontroller.cxx | 244 -----
framework/source/uielement/popuptoolbarcontroller.cxx | 415 ++++++++++
framework/source/uielement/recentfilesmenucontroller.cxx | 4
framework/source/uielement/toolbarmanager.cxx | 16
framework/uiconfig/startmodule/toolbar/standardbar.xml | 2
framework/util/fwk.component | 9
framework/util/fwl.component | 3
odk/examples/DevelopersGuide/GUI/UnoMenu2.java | 4
offapi/com/sun/star/awt/XPopupMenu.idl | 7
offapi/type_reference/types.rdb |binary
officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu | 33
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 3
qadevOOo/tests/java/ifc/frame/_XPopupMenuController.java | 2
sc/uiconfig/scalc/toolbar/standardbar.xml | 2
sd/uiconfig/sdraw/toolbar/standardbar.xml | 2
sd/uiconfig/simpress/toolbar/standardbar.xml | 2
sfx2/inc/sfx2/mnuitem.hxx | 12
sfx2/inc/sfx2/tbxctrl.hxx | 40
sfx2/source/appl/appreg.cxx | 2
sfx2/source/menu/mnuitem.cxx | 59 +
sfx2/source/toolbox/tbxitem.cxx | 379 ---------
starmath/uiconfig/smath/toolbar/standardbar.xml | 2
svtools/inc/svtools/toolboxcontroller.hxx | 19
svtools/source/uno/toolboxcontroller.cxx | 86 --
sw/uiconfig/sglobal/toolbar/standardbar.xml | 2
sw/uiconfig/sweb/toolbar/standardbar.xml | 2
sw/uiconfig/swform/toolbar/standardbar.xml | 2
sw/uiconfig/swreport/toolbar/standardbar.xml | 2
sw/uiconfig/swriter/toolbar/standardbar.xml | 2
sw/uiconfig/swxform/toolbar/standardbar.xml | 2
toolkit/inc/toolkit/awt/vclxmenu.hxx | 2
toolkit/source/awt/vclxmenu.cxx | 5
50 files changed, 821 insertions(+), 975 deletions(-)
New commits:
commit 273121f8d7e277e35c8e5a8aad46ef0c103ebc03
Author: Ariel Constenla-Haile <arielch< at >apache.org>
Date: Sat May 25 22:11:58 2013 +0000
Kill SfxAppToolBoxControl_Impl
diff --git a/sfx2/inc/sfx2/mnuitem.hxx b/sfx2/inc/sfx2/mnuitem.hxx
index 9f1dd70..edb4ac9 100644
--- a/sfx2/inc/sfx2/mnuitem.hxx
+++ b/sfx2/inc/sfx2/mnuitem.hxx
< at >< at > -37,6 +37,9 < at >< at > struct SfxMenuCtrlFactory;
#include <tools/string.hxx>
#include <sfx2/ctrlitem.hxx>
+#include <com/sun/star/frame/XDispatch.hpp>
+#include <com/sun/star/util/URL.hpp>
+
class SFX2_DLLPUBLIC SfxMenuControl: public SfxControllerItem
{
//friend SvStream& operator<<( SvStream& rStream, const SfxMenuControl& rItem );
< at >< at > -165,6 +168,15 < at >< at > public:
SFX_DECL_MENU_CONTROL();
SfxAppMenuControl_Impl( sal_uInt16 nPos, Menu& rMenu, SfxBindings& rBindings );
~SfxAppMenuControl_Impl();
+
+ struct ExecuteInfo
+ {
+ ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch;
+ ::com::sun::star::util::URL aTargetURL;
+ ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs;
+ };
+
+ DECL_STATIC_LINK( SfxAppMenuControl_Impl, ExecuteHdl_Impl, ExecuteInfo* );
};
//#endif
diff --git a/sfx2/inc/sfx2/tbxctrl.hxx b/sfx2/inc/sfx2/tbxctrl.hxx
index ebe83f5..0919690 100644
--- a/sfx2/inc/sfx2/tbxctrl.hxx
+++ b/sfx2/inc/sfx2/tbxctrl.hxx
< at >< at > -346,46 +346,6 < at >< at > public:
//------------------------------------------------------------------------
-class SfxAppToolBoxControl_Impl : public SfxToolBoxControl
-
-/* [Beschreibung]
-
- Interne Hilfsklasse f"ur um das Popup-Menu <AppMenu_Impl> unter Neu
- im SDT zu starten.
-*/
-
-{
-public:
- SFX_DECL_TOOLBOX_CONTROL();
- SfxAppToolBoxControl_Impl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox );
- ~SfxAppToolBoxControl_Impl();
- void SetImage( const String& rFacName );
-
- struct ExecuteInfo
- {
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch;
- ::com::sun::star::util::URL aTargetURL;
- ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs;
- };
-
- DECL_STATIC_LINK( SfxAppToolBoxControl_Impl, ExecuteHdl_Impl, ExecuteInfo* );
-
-protected:
- virtual void Click();
- using SfxToolBoxControl::Select;
- virtual void Select( sal_Bool );
- virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
- virtual SfxPopupWindow* CreatePopupWindow();
- DECL_LINK( Activate, Menu * ); // Needed to support high contrast images
-private:
- String aLastURL;
- sal_Bool bBigImages;
- PopupMenu* pMenu;
- sal_uIntPtr m_nSymbolsStyle;
- sal_Bool m_bWasHiContrastMode;
- sal_Bool m_bShowMenuImages;
-};
-
class SfxHistoryToolBoxControl_Impl : public SfxToolBoxControl
{
Timer aTimer;
diff --git a/sfx2/source/appl/appreg.cxx b/sfx2/source/appl/appreg.cxx
index 9c752f5..62c1214 100644
--- a/sfx2/source/appl/appreg.cxx
+++ b/sfx2/source/appl/appreg.cxx
< at >< at > -69,8 +69,6 < at >< at > void SfxApplication::Registrations_Impl()
// Controller
SfxToolBoxControl::RegisterControl(SID_REPEAT);
SfxURLToolBoxControl_Impl::RegisterControl(SID_OPENURL);
- SfxAppToolBoxControl_Impl::RegisterControl( SID_NEWDOCDIRECT );
- SfxAppToolBoxControl_Impl::RegisterControl( SID_AUTOPILOTMENU );
};
//--------------------------------------------------------------------
diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx
index d4edbde..ad6994a 100644
--- a/sfx2/source/menu/mnuitem.cxx
+++ b/sfx2/source/menu/mnuitem.cxx
< at >< at > -574,3 +574,62 < at >< at > void SfxUnoMenuControl::Select()
{
pUnoCtrl->Execute();
}
+
+long Select_Impl( void* /*pHdl*/, void* pVoid )
+{
+ Menu* pMenu = (Menu*)pVoid;
+ String aURL( pMenu->GetItemCommand( pMenu->GetCurItemId() ) );
+
+ if( !aURL.Len() )
+ return 0;
+
+ Reference < ::com::sun::star::frame::XFramesSupplier > xDesktop =
+ Reference < ::com::sun::star::frame::XFramesSupplier >( ::comphelper::getProcessServiceFactory()->createInstance(
+ DEFINE_CONST_UNICODE("com.sun.star.frame.Desktop") ), UNO_QUERY );
+ Reference < ::com::sun::star::frame::XFrame > xFrame( xDesktop, UNO_QUERY );
+
+ URL aTargetURL;
+ aTargetURL.Complete = aURL;
+ Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance(
+ rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer" )),
+ UNO_QUERY );
+ xTrans->parseStrict( aTargetURL );
+
+ Reference < XDispatchProvider > xProv( xFrame, UNO_QUERY );
+ Reference < XDispatch > xDisp;
+ if ( xProv.is() )
+ {
+ if ( aTargetURL.Protocol.compareToAscii("slot:") == COMPARE_EQUAL )
+ xDisp = xProv->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
+ else
+ {
+ ::rtl::OUString aTargetFrame( ::rtl::OUString::createFromAscii( "_blank" ) );
+ ::framework::MenuConfiguration::Attributes* pMenuAttributes =
+ (::framework::MenuConfiguration::Attributes*)pMenu->GetUserValue( pMenu->GetCurItemId() );
+
+ if ( pMenuAttributes )
+ aTargetFrame = pMenuAttributes->aTargetFrame;
+
+ xDisp = xProv->queryDispatch( aTargetURL, aTargetFrame , 0 );
+ }
+ }
+
+ if ( xDisp.is() )
+ {
+ SfxAppMenuControl_Impl::ExecuteInfo* pExecuteInfo = new SfxAppMenuControl_Impl::ExecuteInfo;
+ pExecuteInfo->xDispatch = xDisp;
+ pExecuteInfo->aTargetURL = aTargetURL;
+ pExecuteInfo->aArgs = Sequence< PropertyValue >();
+ Application::PostUserEvent( STATIC_LINK( 0, SfxAppMenuControl_Impl, ExecuteHdl_Impl), pExecuteInfo );
+ }
+
+ return sal_True;
+}
+
+
+IMPL_STATIC_LINK_NOINSTANCE( SfxAppMenuControl_Impl, ExecuteHdl_Impl, ExecuteInfo*, pExecuteInfo )
+{
+ pExecuteInfo->xDispatch->dispatch( pExecuteInfo->aTargetURL, pExecuteInfo->aArgs );
+ delete pExecuteInfo;
+ return 0;
+}
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index 45f7903..a8c3824 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
< at >< at > -121,7 +121,6 < at >< at > using namespace ::com::sun::star::ui;
//====================================================================
SFX_IMPL_TOOLBOX_CONTROL_ARG(SfxToolBoxControl, SfxStringItem, sal_True);
-SFX_IMPL_TOOLBOX_CONTROL(SfxAppToolBoxControl_Impl, SfxStringItem);
static Window* GetTopMostParentSystemWindow( Window* pWindow )
{
< at >< at > -1510,381 +1509,3 < at >< at > IMPL_LINK( SfxPopupWindow, Delete, void *, EMPTYARG )
//--------------------------------------------------------------------
-SfxAppToolBoxControl_Impl::SfxAppToolBoxControl_Impl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox )
- : SfxToolBoxControl( nSlotId, nId, rBox )
- , bBigImages( sal_False )
- , pMenu( 0 )
-{
- rBox.SetHelpId( nId, HID_TBXCONTROL_FILENEW );
- rBox.SetItemBits( nId, rBox.GetItemBits( nId ) | TIB_DROPDOWN);
-
- // Determine the current background color of the menus
- const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
- m_nSymbolsStyle = rSettings.GetSymbolsStyle();
- m_bWasHiContrastMode = rSettings.GetHighContrastMode();
- m_bShowMenuImages = rSettings.GetUseImagesInMenus();
-
- SetImage( String() );
-}
-
-SfxAppToolBoxControl_Impl::~SfxAppToolBoxControl_Impl()
-{
- delete pMenu;
-}
-
-//_____________________________________________________
-/*
- it return the existing state of the given URL in the popupmenu of this toolbox control.
-
- If the given URL can be located as an action command of one menu item of the
- popup menu of this control, we return sal_True. Otherwhise we return sal_False.
- Further we return a fallback URL, in case we have to return sal_False. Because
- the outside code must select a valid item of the popup menu everytime ...
- and we define it here. By the way this m ethod was written to handle
- error situations gracefully. E.g. it can be called during creation time
- but then we have no valid menu. For this case we know another fallback URL.
- Then we return the private:factory/ URL of the default factory.
-
- < at >param *pMenu
- pounts to the popup menu, on which item we try to locate the given URL
- Can be NULL! Search will be supressed then.
-
- < at >param sURL
- the URL for searching
-
- < at >param pFallback
- contains the fallback URL in case we return FALSE
- Must point to valid memory!
-
- < at >param pImage
- contains the image of the menu for the URL.
-
- < at >return sal_True - if URL could be located as an item of the popup menu.
- sal_False - otherwhise.
-*/
-sal_Bool Impl_ExistURLInMenu( const PopupMenu *pMenu ,
- String &sURL ,
- String *pFallback ,
- Image *pImage )
-{
- sal_Bool bValidFallback = sal_False;
- if (pMenu && sURL.Len())
- {
- sal_uInt16 c = pMenu->GetItemCount();
- for (sal_uInt16 p=0; p<c; ++p)
- {
- sal_uInt16 nId = pMenu->GetItemId(p);
- String aCmd( pMenu->GetItemCommand(nId) );
-
- if (!bValidFallback && aCmd.Len())
- {
- *pFallback = aCmd;
- bValidFallback = sal_True;
- }
-
- if (aCmd.Search(sURL)==0)//match even if the menu command is more detailed (maybe an additional query) #i28667#
- {
- sURL = aCmd;
- *pImage = pMenu->GetItemImage( nId );
- return sal_True;
- }
- }
- }
-
- if (!bValidFallback)
- {
- *pFallback = DEFINE_CONST_UNICODE("private:factory/");
- *pFallback += String(SvtModuleOptions().GetDefaultModuleName());
- }
-
- return sal_False;
-}
-
-long Select_Impl( void* pHdl, void* pVoid );
-
-SfxPopupWindow* SfxAppToolBoxControl_Impl::CreatePopupWindow()
-{
- ToolBox& rBox = GetToolBox();
- ::Rectangle aRect( rBox.GetItemRect( GetId() ) );
-
- if ( !pMenu )
- {
- ::framework::MenuConfiguration aConf( m_xServiceManager );
- if ( m_aCommandURL.equalsAscii( ".uno:AddDirect" ))
- pMenu = aConf.CreateBookmarkMenu( m_xFrame, BOOKMARK_NEWMENU );
- else
- pMenu = aConf.CreateBookmarkMenu( m_xFrame, BOOKMARK_WIZARDMENU );
- }
-
- if ( pMenu )
- {
- pMenu->SetSelectHdl( Link( NULL, Select_Impl ) );
- pMenu->SetActivateHdl( LINK( this, SfxAppToolBoxControl_Impl, Activate ));
- rBox.SetItemDown( GetId(), sal_True );
- sal_uInt16 nSelected = pMenu->Execute( &rBox, aRect, POPUPMENU_EXECUTE_DOWN );
- if ( nSelected )
- {
- aLastURL = pMenu->GetItemCommand( nSelected );
- SetImage( pMenu->GetItemCommand( nSelected ) );
- }
-
- rBox.SetItemDown( GetId(), sal_False );
- }
-
- return 0;
-}
-
-void SfxAppToolBoxControl_Impl::SetImage( const String &rURL )
-{
- /* We accept URL's here only, which exist as items of our internal popup menu.
- All other ones will be ignored and a fallback is used ... */
- String aURL = rURL;
- String sFallback;
- Image aMenuImage;
- sal_Bool bValid = Impl_ExistURLInMenu(pMenu,aURL,&sFallback,&aMenuImage);
- if (!bValid)
- aURL = sFallback;
-
- sal_Bool bBig = SvtMiscOptions().AreCurrentSymbolsLarge();
- sal_Bool bHC = GetToolBox().GetSettings().GetStyleSettings().GetHighContrastMode();
- Image aImage = SvFileInformationManager::GetImageNoDefault( INetURLObject( aURL ), bBig, bHC );
- if ( !aImage )
- aImage = !!aMenuImage ? aMenuImage :
- SvFileInformationManager::GetImage( INetURLObject( aURL ), bBig, bHC );
- Size aBigSize( GetToolBox().GetDefaultImageSize() );
- if ( bBig && aImage.GetSizePixel() != aBigSize )
- {
- BitmapEx aScaleBmpEx( aImage.GetBitmapEx() );
- aScaleBmpEx.Scale( aBigSize, BMP_SCALE_INTERPOLATE );
- GetToolBox().SetItemImage( GetId(), Image( aScaleBmpEx ) );
- }
- else
- GetToolBox().SetItemImage( GetId(), aImage );
- aLastURL = aURL;
-}
-
-void SfxAppToolBoxControl_Impl::StateChanged
-(
- sal_uInt16 nSlotId,
- SfxItemState eState,
- const SfxPoolItem* pState
-)
-{
- if ( pState && pState->ISA(SfxStringItem) )
- {
- // Important step for following SetImage() call!
- // It needs the valid pMenu item to fullfill it's specification
- // to check for supported URLs ...
- if ( !pMenu )
- {
- ::framework::MenuConfiguration aConf( m_xServiceManager );
- // This toolbox controller is used for two popup menus (new documents and wizards!). Create the correct
- // popup menu according to the slot ID our controller has been initialized with.
- if ( nSlotId == SID_NEWDOCDIRECT )
- pMenu = aConf.CreateBookmarkMenu( m_xFrame, BOOKMARK_NEWMENU );
- else
- pMenu = aConf.CreateBookmarkMenu( m_xFrame, BOOKMARK_WIZARDMENU );
- }
-
- GetToolBox().EnableItem( GetId(), eState != SFX_ITEM_DISABLED );
- SetImage(((const SfxStringItem*)pState)->GetValue());
- }
- else
- SfxToolBoxControl::StateChanged( nSlotId, eState, pState );
-}
-
-//--------------------------------------------------------------------
-
-void SfxAppToolBoxControl_Impl::Select( sal_Bool bMod1 )
-{
- if( aLastURL.Len() )
- {
- URL aTargetURL;
- Reference< XDispatch > xDispatch;
- Reference< XDispatchProvider > xDispatchProvider( getFrameInterface(), UNO_QUERY );
-
- if ( xDispatchProvider.is() )
- {
- aTargetURL.Complete = aLastURL;
- getURLTransformer()->parseStrict( aTargetURL );
-
- ::rtl::OUString aTarget( ::rtl::OUString::createFromAscii( "_default" ));
- if ( pMenu )
- {
- ::framework::MenuConfiguration::Attributes* pMenuAttributes =
- (::framework::MenuConfiguration::Attributes*)pMenu->GetUserValue( pMenu->GetCurItemId() );
-
- if ( pMenuAttributes )
- aTarget = pMenuAttributes->aTargetFrame;
- }
-
- xDispatch = xDispatchProvider->queryDispatch( aTargetURL, aTarget, 0 );
-
- if ( xDispatch.is() )
- {
- Sequence< PropertyValue > aArgs( 1 );
-
- aArgs[0].Name = ::rtl::OUString::createFromAscii( "Referer" );
- aArgs[0].Value = makeAny( ::rtl::OUString::createFromAscii( SFX_REFERER_USER ));
-
- ExecuteInfo* pExecuteInfo = new ExecuteInfo;
- pExecuteInfo->xDispatch = xDispatch;
- pExecuteInfo->aTargetURL = aTargetURL;
- pExecuteInfo->aArgs = aArgs;
- Application::PostUserEvent( STATIC_LINK(0, SfxAppToolBoxControl_Impl, ExecuteHdl_Impl), pExecuteInfo );
- }
- }
- }
- else
- SfxToolBoxControl::Select( bMod1 );
-}
-
-//--------------------------------------------------------------------
-long Select_Impl( void* /*pHdl*/, void* pVoid )
-{
- Menu* pMenu = (Menu*)pVoid;
- String aURL( pMenu->GetItemCommand( pMenu->GetCurItemId() ) );
-
- if( !aURL.Len() )
- return 0;
-
- Reference < ::com::sun::star::frame::XFramesSupplier > xDesktop =
- Reference < ::com::sun::star::frame::XFramesSupplier >( ::comphelper::getProcessServiceFactory()->createInstance(
- DEFINE_CONST_UNICODE("com.sun.star.frame.Desktop") ), UNO_QUERY );
- Reference < ::com::sun::star::frame::XFrame > xFrame( xDesktop, UNO_QUERY );
-
- URL aTargetURL;
- aTargetURL.Complete = aURL;
- Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance(
- rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer" )),
- UNO_QUERY );
- xTrans->parseStrict( aTargetURL );
-
- Reference < XDispatchProvider > xProv( xFrame, UNO_QUERY );
- Reference < XDispatch > xDisp;
- if ( xProv.is() )
- {
- if ( aTargetURL.Protocol.compareToAscii("slot:") == COMPARE_EQUAL )
- xDisp = xProv->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
- else
- {
- ::rtl::OUString aTargetFrame( ::rtl::OUString::createFromAscii( "_blank" ) );
- ::framework::MenuConfiguration::Attributes* pMenuAttributes =
- (::framework::MenuConfiguration::Attributes*)pMenu->GetUserValue( pMenu->GetCurItemId() );
-
- if ( pMenuAttributes )
- aTargetFrame = pMenuAttributes->aTargetFrame;
-
- xDisp = xProv->queryDispatch( aTargetURL, aTargetFrame , 0 );
- }
- }
-
- if ( xDisp.is() )
- {
- SfxAppToolBoxControl_Impl::ExecuteInfo* pExecuteInfo = new SfxAppToolBoxControl_Impl::ExecuteInfo;
- pExecuteInfo->xDispatch = xDisp;
- pExecuteInfo->aTargetURL = aTargetURL;
- pExecuteInfo->aArgs = Sequence< PropertyValue >();
- Application::PostUserEvent( STATIC_LINK( 0, SfxAppToolBoxControl_Impl, ExecuteHdl_Impl), pExecuteInfo );
- }
-
- return sal_True;
-}
-
-IMPL_LINK( SfxAppToolBoxControl_Impl, Activate, Menu *, pActMenu )
-{
- if ( pActMenu )
- {
- const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
- sal_uIntPtr nSymbolsStyle = rSettings.GetSymbolsStyle();
- sal_Bool bIsHiContrastMode = rSettings.GetHighContrastMode();
- sal_Bool bShowMenuImages = rSettings.GetUseImagesInMenus();
-
- if (( nSymbolsStyle != m_nSymbolsStyle ) ||
- ( bIsHiContrastMode != m_bWasHiContrastMode ) ||
- ( bShowMenuImages != m_bShowMenuImages ))
- {
- m_nSymbolsStyle = nSymbolsStyle;
- m_bWasHiContrastMode = bIsHiContrastMode;
- m_bShowMenuImages = bShowMenuImages;
-
- sal_uInt16 nCount = pActMenu->GetItemCount();
- for ( sal_uInt16 nSVPos = 0; nSVPos < nCount; nSVPos++ )
- {
- sal_uInt16 nId = pActMenu->GetItemId( nSVPos );
- if ( pActMenu->GetItemType( nSVPos ) != MENUITEM_SEPARATOR )
- {
- if ( bShowMenuImages )
- {
- sal_Bool bImageSet = sal_False;
- ::rtl::OUString aImageId;
- ::framework::MenuConfiguration::Attributes* pMenuAttributes =
- (::framework::MenuConfiguration::Attributes*)pMenu->GetUserValue( nId );
-
- if ( pMenuAttributes )
- aImageId = pMenuAttributes->aImageId; // Retrieve image id from menu attributes
-
- if ( aImageId.getLength() > 0 )
- {
- Reference< ::com::sun::star::frame::XFrame > xFrame;
- Image aImage = GetImage( xFrame, aImageId, sal_False, bIsHiContrastMode );
- if ( !!aImage )
- {
- bImageSet = sal_True;
- pActMenu->SetItemImage( nId, aImage );
- }
- }
-
- String aCmd( pActMenu->GetItemCommand( nId ) );
- if ( !bImageSet && aCmd.Len() )
- {
- Image aImage = SvFileInformationManager::GetImage(
- INetURLObject(aCmd), sal_False, bIsHiContrastMode );
- if ( !!aImage )
- pActMenu->SetItemImage( nId, aImage );
- }
- }
- else
- pActMenu->SetItemImage( nId, Image() );
- }
- }
- }
-
- return sal_True;
- }
-
- return sal_False;
-}
-
-//--------------------------------------------------------------------
-
-IMPL_STATIC_LINK_NOINSTANCE( SfxAppToolBoxControl_Impl, ExecuteHdl_Impl, ExecuteInfo*, pExecuteInfo )
-{
-/* i62706: Don't catch all exceptions. We hide all problems here and are not able
- to handle them on higher levels.
- try
- {
-*/
- // Asynchronous execution as this can lead to our own destruction!
- // Framework can recycle our current frame and the layout manager disposes all user interface
- // elements if a component gets detached from its frame!
- pExecuteInfo->xDispatch->dispatch( pExecuteInfo->aTargetURL, pExecuteInfo->aArgs );
-/*
-}
- catch (const ::com::sun::star::document::CorruptedFilterConfigurationException& exFilters)
- {
- throw exFilters;
- }
- catch (const Exception& )
- {
- }
-*/
- delete pExecuteInfo;
- return 0;
-}
-
-//--------------------------------------------------------------------
-
-void SfxAppToolBoxControl_Impl::Click( )
-{
-}
commit c1954d6e72071c12aa4eda412d4370a22f91f787
Author: Ariel Constenla-Haile <arielch< at >apache.org>
Date: Sat May 25 22:11:47 2013 +0000
Add an icon for .uno:AutoPilotMenu
diff --git a/default_images/res/commandimagelist/lc_autopilotmenu.png b/default_images/res/commandimagelist/lc_autopilotmenu.png
new file mode 100644
index 0000000..ff5ec86
Binary files /dev/null and b/default_images/res/commandimagelist/lc_autopilotmenu.png differ
diff --git a/default_images/res/commandimagelist/lch_autopilotmenu.png b/default_images/res/commandimagelist/lch_autopilotmenu.png
new file mode 100644
index 0000000..9dbb8b6
Binary files /dev/null and b/default_images/res/commandimagelist/lch_autopilotmenu.png differ
diff --git a/default_images/res/commandimagelist/sc_autopilotmenu.png b/default_images/res/commandimagelist/sc_autopilotmenu.png
new file mode 100644
index 0000000..ed92277
Binary files /dev/null and b/default_images/res/commandimagelist/sc_autopilotmenu.png differ
diff --git a/default_images/res/commandimagelist/sch_autopilotmenu.png b/default_images/res/commandimagelist/sch_autopilotmenu.png
new file mode 100644
index 0000000..4611aed
Binary files /dev/null and b/default_images/res/commandimagelist/sch_autopilotmenu.png differ
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 2ef0336..61ef187 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
< at >< at > -458,6 +458,9 < at >< at >
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">~Wizards</value>
</prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
</node>
<node oor:name=".uno:AutoPilotPresentations" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
commit b38a51d67373daf9a45a4701e7c760c7b3571a66
Author: Ariel Constenla-Haile <arielch< at >apache.org>
Date: Sat May 25 22:11:30 2013 +0000
Make .uno:Open a drop-down toolbar item
diff --git a/basctl/uiconfig/basicide/toolbar/standardbar.xml b/basctl/uiconfig/basicide/toolbar/standardbar.xml
index 9fc57c4..156b2cc 100644
--- a/basctl/uiconfig/basicide/toolbar/standardbar.xml
+++ b/basctl/uiconfig/basicide/toolbar/standardbar.xml
< at >< at > -25,7 +25,7 < at >< at >
<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
<toolbar:toolbaritem xlink:href=".uno:OpenUrl" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:AddDirect" toolbar:style="dropdown"/>
- <toolbar:toolbaritem xlink:href=".uno:Open"/>
+ <toolbar:toolbaritem xlink:href=".uno:Open" toolbar:style="dropdown"/>
<toolbar:toolbaritem xlink:href=".uno:Save"/>
<toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
diff --git a/chart2/uiconfig/toolbar/standardbar.xml b/chart2/uiconfig/toolbar/standardbar.xml
index 126892e..34edbde 100644
--- a/chart2/uiconfig/toolbar/standardbar.xml
+++ b/chart2/uiconfig/toolbar/standardbar.xml
< at >< at > -25,7 +25,7 < at >< at >
<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
<toolbar:toolbaritem xlink:href=".uno:AddDirect" toolbar:style="dropdown"/>
<toolbar:toolbaritem xlink:href=".uno:NewDoc" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:Open"/>
+ <toolbar:toolbaritem xlink:href=".uno:Open" toolbar:style="dropdown"/>
<toolbar:toolbaritem xlink:href=".uno:Save"/>
<toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:SendMail"/>
diff --git a/dbaccess/uiconfig/dbapp/toolbar/toolbar.xml b/dbaccess/uiconfig/dbapp/toolbar/toolbar.xml
index c850a78..0ac83ae 100644
--- a/dbaccess/uiconfig/dbapp/toolbar/toolbar.xml
+++ b/dbaccess/uiconfig/dbapp/toolbar/toolbar.xml
< at >< at > -25,7 +25,7 < at >< at >
<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
<toolbar:toolbaritem xlink:href=".uno:OpenUrl" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:AddDirect" toolbar:style="dropdown"/>
- <toolbar:toolbaritem xlink:href=".uno:Open"/>
+ <toolbar:toolbaritem xlink:href=".uno:Open" toolbar:style="dropdown"/>
<toolbar:toolbaritem xlink:href=".uno:Save"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:Copy"/>
diff --git a/framework/uiconfig/startmodule/toolbar/standardbar.xml b/framework/uiconfig/startmodule/toolbar/standardbar.xml
index 858daf9..d357c72 100644
--- a/framework/uiconfig/startmodule/toolbar/standardbar.xml
+++ b/framework/uiconfig/startmodule/toolbar/standardbar.xml
< at >< at > -26,7 +26,7 < at >< at >
<toolbar:toolbaritem xlink:href=".uno:OpenUrl" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:AddDirect" toolbar:style="dropdown"/>
<toolbar:toolbaritem xlink:href=".uno:NewDoc" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:Open"/>
+ <toolbar:toolbaritem xlink:href=".uno:Open" toolbar:style="dropdown"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:HelpIndex"/>
<toolbar:toolbaritem xlink:href=".uno:ExtendedHelp" toolbar:visible="false"/>
diff --git a/sc/uiconfig/scalc/toolbar/standardbar.xml b/sc/uiconfig/scalc/toolbar/standardbar.xml
index e922c45..7d074bb 100644
--- a/sc/uiconfig/scalc/toolbar/standardbar.xml
+++ b/sc/uiconfig/scalc/toolbar/standardbar.xml
< at >< at > -26,7 +26,7 < at >< at >
<toolbar:toolbaritem xlink:href=".uno:OpenUrl" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:AddDirect"/>
<toolbar:toolbaritem xlink:href=".uno:NewDoc" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:Open"/>
+ <toolbar:toolbaritem xlink:href=".uno:Open" toolbar:style="dropdown"/>
<toolbar:toolbaritem xlink:href=".uno:Save"/>
<toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:SendMail"/>
diff --git a/sd/uiconfig/sdraw/toolbar/standardbar.xml b/sd/uiconfig/sdraw/toolbar/standardbar.xml
index 5dbb3b9..fc1d47a 100644
--- a/sd/uiconfig/sdraw/toolbar/standardbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/standardbar.xml
< at >< at > -26,7 +26,7 < at >< at >
<toolbar:toolbaritem xlink:href=".uno:OpenUrl" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:AddDirect"/>
<toolbar:toolbaritem xlink:href=".uno:NewDoc" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:Open"/>
+ <toolbar:toolbaritem xlink:href=".uno:Open" toolbar:style="dropdown"/>
<toolbar:toolbaritem xlink:href=".uno:Save"/>
<toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:SendMail"/>
diff --git a/sd/uiconfig/simpress/toolbar/standardbar.xml b/sd/uiconfig/simpress/toolbar/standardbar.xml
index 38ddb96..3aeb78c 100644
--- a/sd/uiconfig/simpress/toolbar/standardbar.xml
+++ b/sd/uiconfig/simpress/toolbar/standardbar.xml
< at >< at > -26,7 +26,7 < at >< at >
<toolbar:toolbaritem xlink:href=".uno:OpenUrl" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:AddDirect" toolbar:style="dropdown"/>
<toolbar:toolbaritem xlink:href=".uno:NewDoc" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:Open"/>
+ <toolbar:toolbaritem xlink:href=".uno:Open" toolbar:style="dropdown"/>
<toolbar:toolbaritem xlink:href=".uno:Save"/>
<toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:SendMail"/>
diff --git a/starmath/uiconfig/smath/toolbar/standardbar.xml b/starmath/uiconfig/smath/toolbar/standardbar.xml
index a6d031b..2868a18 100644
--- a/starmath/uiconfig/smath/toolbar/standardbar.xml
+++ b/starmath/uiconfig/smath/toolbar/standardbar.xml
< at >< at > -26,7 +26,7 < at >< at >
<toolbar:toolbaritem xlink:href=".uno:OpenUrl" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:AddDirect" toolbar:style="dropdown"/>
<toolbar:toolbaritem xlink:href=".uno:NewDoc" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:Open"/>
+ <toolbar:toolbaritem xlink:href=".uno:Open" toolbar:style="dropdown"/>
<toolbar:toolbaritem xlink:href=".uno:Save"/>
<toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:SendMail"/>
diff --git a/sw/uiconfig/sglobal/toolbar/standardbar.xml b/sw/uiconfig/sglobal/toolbar/standardbar.xml
index fe6385a..8ad7b47 100644
--- a/sw/uiconfig/sglobal/toolbar/standardbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/standardbar.xml
< at >< at > -26,7 +26,7 < at >< at >
<toolbar:toolbaritem xlink:href=".uno:OpenUrl" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:AddDirect"/>
<toolbar:toolbaritem xlink:href=".uno:NewDoc" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:Open"/>
+ <toolbar:toolbaritem xlink:href=".uno:Open" toolbar:style="dropdown"/>
<toolbar:toolbaritem xlink:href=".uno:Save"/>
<toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:SendMail"/>
diff --git a/sw/uiconfig/sweb/toolbar/standardbar.xml b/sw/uiconfig/sweb/toolbar/standardbar.xml
index da71e3f..8b9d37f 100644
--- a/sw/uiconfig/sweb/toolbar/standardbar.xml
+++ b/sw/uiconfig/sweb/toolbar/standardbar.xml
< at >< at > -26,7 +26,7 < at >< at >
<toolbar:toolbaritem xlink:href=".uno:OpenUrl" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:AddDirect"/>
<toolbar:toolbaritem xlink:href=".uno:NewDoc" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:Open"/>
+ <toolbar:toolbaritem xlink:href=".uno:Open" toolbar:style="dropdown"/>
<toolbar:toolbaritem xlink:href=".uno:Save"/>
<toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:SendMail"/>
diff --git a/sw/uiconfig/swform/toolbar/standardbar.xml b/sw/uiconfig/swform/toolbar/standardbar.xml
index fe6385a..8ad7b47 100644
--- a/sw/uiconfig/swform/toolbar/standardbar.xml
+++ b/sw/uiconfig/swform/toolbar/standardbar.xml
< at >< at > -26,7 +26,7 < at >< at >
<toolbar:toolbaritem xlink:href=".uno:OpenUrl" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:AddDirect"/>
<toolbar:toolbaritem xlink:href=".uno:NewDoc" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:Open"/>
+ <toolbar:toolbaritem xlink:href=".uno:Open" toolbar:style="dropdown"/>
<toolbar:toolbaritem xlink:href=".uno:Save"/>
<toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:SendMail"/>
diff --git a/sw/uiconfig/swreport/toolbar/standardbar.xml b/sw/uiconfig/swreport/toolbar/standardbar.xml
index fe6385a..8ad7b47 100644
--- a/sw/uiconfig/swreport/toolbar/standardbar.xml
+++ b/sw/uiconfig/swreport/toolbar/standardbar.xml
< at >< at > -26,7 +26,7 < at >< at >
<toolbar:toolbaritem xlink:href=".uno:OpenUrl" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:AddDirect"/>
<toolbar:toolbaritem xlink:href=".uno:NewDoc" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:Open"/>
+ <toolbar:toolbaritem xlink:href=".uno:Open" toolbar:style="dropdown"/>
<toolbar:toolbaritem xlink:href=".uno:Save"/>
<toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:SendMail"/>
diff --git a/sw/uiconfig/swriter/toolbar/standardbar.xml b/sw/uiconfig/swriter/toolbar/standardbar.xml
index fe6385a..8ad7b47 100644
--- a/sw/uiconfig/swriter/toolbar/standardbar.xml
+++ b/sw/uiconfig/swriter/toolbar/standardbar.xml
< at >< at > -26,7 +26,7 < at >< at >
<toolbar:toolbaritem xlink:href=".uno:OpenUrl" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:AddDirect"/>
<toolbar:toolbaritem xlink:href=".uno:NewDoc" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:Open"/>
+ <toolbar:toolbaritem xlink:href=".uno:Open" toolbar:style="dropdown"/>
<toolbar:toolbaritem xlink:href=".uno:Save"/>
<toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:SendMail"/>
diff --git a/sw/uiconfig/swxform/toolbar/standardbar.xml b/sw/uiconfig/swxform/toolbar/standardbar.xml
index 9fb204e..6f442e1 100644
--- a/sw/uiconfig/swxform/toolbar/standardbar.xml
+++ b/sw/uiconfig/swxform/toolbar/standardbar.xml
< at >< at > -26,7 +26,7 < at >< at >
<toolbar:toolbaritem xlink:href=".uno:OpenUrl" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:AddDirect"/>
<toolbar:toolbaritem xlink:href=".uno:NewDoc" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:Open"/>
+ <toolbar:toolbaritem xlink:href=".uno:Open" toolbar:style="dropdown"/>
<toolbar:toolbaritem xlink:href=".uno:Save"/>
<toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:SendMail"/>
commit 9d1015051c92900def3d465d2eb8bf179f19a398
Author: Ariel Constenla-Haile <arielch< at >apache.org>
Date: Sat May 25 22:11:08 2013 +0000
framework::PopupMenuController clean-up
Changed the name, it is not a PopupMenuController, but a ToolbarController that shows a PopupMenu filled at runtime by a PopupMenuController
Make it a base class for other ToolbarController components, there is no sense to make it a component by itself
Use this base class for three new pure UNO ToolbarController's
diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk
index db55c57..d541867 100644
--- a/framework/Library_fwk.mk
+++ b/framework/Library_fwk.mk
< at >< at > -112,11 +112,11 < at >< at > $(eval $(call gb_Library_add_exception_objects,fwk,\
framework/source/loadenv/loadenv \
framework/source/loadenv/targethelper \
framework/source/register/registerservices \
+ framework/source/services/ContextChangeEventMultiplexer \
framework/source/services/autorecovery \
framework/source/services/backingcomp \
framework/source/services/backingwindow \
framework/source/services/desktop \
- framework/source/services/ContextChangeEventMultiplexer \
framework/source/services/frame \
framework/source/services/modelwinservice \
framework/source/services/modulemanager \
< at >< at > -154,6 +154,7 < at >< at > $(eval $(call gb_Library_add_exception_objects,fwk,\
framework/source/uielement/menubarmerger \
framework/source/uielement/menubarwrapper \
framework/source/uielement/objectmenucontroller \
+ framework/source/uielement/popuptoolbarcontroller \
framework/source/uielement/panelwindow \
framework/source/uielement/panelwrapper \
framework/source/uielement/progressbarwrapper \
< at >< at > -175,8 +176,8 < at >< at > $(eval $(call gb_Library_add_exception_objects,fwk,\
framework/source/uifactory/factoryconfiguration \
framework/source/uifactory/menubarfactory \
framework/source/uifactory/statusbarfactory \
- framework/source/uifactory/uicontrollerfactory \
framework/source/uifactory/toolboxfactory \
+ framework/source/uifactory/uicontrollerfactory \
framework/source/uifactory/uielementfactorymanager \
framework/source/uifactory/windowcontentfactorymanager \
framework/source/xml/acceleratorconfigurationreader \
diff --git a/framework/Library_fwl.mk b/framework/Library_fwl.mk
index 04aa707..3347c7c 100644
--- a/framework/Library_fwl.mk
+++ b/framework/Library_fwl.mk
< at >< at > -73,7 +73,6 < at >< at > $(eval $(call gb_Library_add_exception_objects,fwl,\
framework/source/uielement/langselectionmenucontroller \
framework/source/uielement/macrosmenucontroller \
framework/source/uielement/newmenucontroller \
- framework/source/uielement/popupmenucontroller \
framework/source/uielement/toolbarsmenucontroller \
))
diff --git a/framework/inc/uielement/popupmenucontroller.hxx b/framework/inc/uielement/popupmenucontroller.hxx
deleted file mode 100644
index e00ff9c..0000000
--- a/framework/inc/uielement/popupmenucontroller.hxx
+++ /dev/null
< at >< at > -1,76 +0,0 < at >< at >
-/**************************************************************
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- *************************************************************/
-
-
-
-#ifndef __FRAMEWORK_POPUPMENUCONTROLLER_HXX_
-#define __FRAMEWORK_POPUPMENUCONTROLLER_HXX_
-
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/frame/XPopupMenuController.hpp>
-
-#include "svtools/toolboxcontroller.hxx"
-#include "boost/scoped_ptr.hpp"
-
-#include <macros/xserviceinfo.hxx>
-
-class Window;
-
-namespace framework
-{
-class PopupMenuControllerImpl;
-
-class PopupMenuController : public svt::ToolboxController, public ::com::sun::star::lang::XServiceInfo
-{
-public:
- PopupMenuController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager );
- ~PopupMenuController();
-
- // XInterface
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL acquire() throw ();
- virtual void SAL_CALL release() throw ();
-
- // XServiceInfo
- DECLARE_XSERVICEINFO
-
- // XComponent
- virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException);
-
- // XStatusListener
- virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException );
-
- // XToolbarController
- virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL click() throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL doubleClick() throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createPopupWindow() throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createItemWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& Parent ) throw (::com::sun::star::uno::RuntimeException);
-
- bool CreatePopupMenuController() throw (::com::sun::star::uno::Exception);
-
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XPopupMenuController > mxPopupMenuController;
- ::com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu > mxPopupMenu;
-};
-
-} // namespace framework
-
-#endif // __FRAMEWORK_POPUPMENUCONTROLLER_HXX_
diff --git a/framework/inc/uielement/popuptoolbarcontroller.hxx b/framework/inc/uielement/popuptoolbarcontroller.hxx
new file mode 100644
index 0000000..f42adbd
--- /dev/null
+++ b/framework/inc/uielement/popuptoolbarcontroller.hxx
< at >< at > -0,0 +1,100 < at >< at >
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+#ifndef __FRAMEWORK_UIELEMENT_POPUPMENU_TOOLBARCONTROLLER_HXX__
+#define __FRAMEWORK_UIELEMENT_POPUPMENU_TOOLBARCONTROLLER_HXX__
+
+#include <com/sun/star/awt/XPopupMenu.hpp>
+#include <com/sun/star/frame/XPopupMenuController.hpp>
+#include <com/sun/star/frame/XUIControllerFactory.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <cppuhelper/implbase1.hxx>
+#include <macros/xserviceinfo.hxx>
+#include <svtools/toolboxcontroller.hxx>
+
+namespace framework
+{
+ class PopupMenuToolbarController : public svt::ToolboxController
+ {
+ public:
+ virtual ~PopupMenuToolbarController();
+
+ // XComponent
+ virtual void SAL_CALL dispose() throw ( ::com::sun::star::uno::RuntimeException );
+ // XInitialization
+ virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+ // XToolbarController
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createPopupWindow() throw (::com::sun::star::uno::RuntimeException);
+ // XStatusListener
+ virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& rEvent ) throw ( ::com::sun::star::uno::RuntimeException );
+
+ protected:
+ PopupMenuToolbarController( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
+ const ::rtl::OUString &rPopupCommand = rtl::OUString() );
+ virtual void functionExecuted( const rtl::OUString &rCommand );
+ virtual sal_uInt16 getDropDownStyle() const;
+ void createPopupMenuController();
+
+ com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_xContext;
+ sal_Bool m_bHasController;
+ com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu > m_xPopupMenu;
+
+ private:
+ rtl::OUString m_aPopupCommand;
+ com::sun::star::uno::Reference< com::sun::star::frame::XUIControllerFactory > m_xPopupMenuFactory;
+ com::sun::star::uno::Reference< com::sun::star::frame::XPopupMenuController > m_xPopupMenuController;
+ };
+
+ class OpenToolbarController : public PopupMenuToolbarController
+ {
+ public:
+ OpenToolbarController( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
+
+ // XServiceInfo
+ DECLARE_XSERVICEINFO
+ };
+
+ class NewToolbarController : public PopupMenuToolbarController
+ {
+ public:
+ NewToolbarController( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
+
+ // XServiceInfo
+ DECLARE_XSERVICEINFO
+ private:
+ void functionExecuted( const rtl::OUString &rCommand );
+ void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& rEvent ) throw ( ::com::sun::star::uno::RuntimeException );
+ void setItemImage( const rtl::OUString &rCommand );
+ };
+
+ class WizardsToolbarController : public PopupMenuToolbarController
+ {
+ public:
+ WizardsToolbarController( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
+
+ // XServiceInfo
+ DECLARE_XSERVICEINFO
+ private:
+ sal_uInt16 getDropDownStyle() const;
+ };
+}
+
+#endif
diff --git a/framework/source/register/registerservices.cxx b/framework/source/register/registerservices.cxx
index f7ef107..725a80f 100644
--- a/framework/source/register/registerservices.cxx
+++ b/framework/source/register/registerservices.cxx
< at >< at > -85,6 +85,7 < at >< at >
#include <services/substitutepathvars.hxx>
#include <services/pathsettings.hxx>
#include <services/ContextChangeEventMultiplexer.hxx>
+#include <uielement/popuptoolbarcontroller.hxx>
COMPONENTGETIMPLEMENTATIONENVIRONMENT
< at >< at > -127,6 +128,9 < at >< at > COMPONENTGETFACTORY ( IFFACTORY( ::framework::URLTransformer
IFFACTORY( ::framework::TabWindowService ) else
IFFACTORY( ::framework::SubstitutePathVariables ) else
IFFACTORY( ::framework::PathSettings ) else
- IFFACTORY( ::framework::ContextChangeEventMultiplexer )
+ IFFACTORY( ::framework::ContextChangeEventMultiplexer ) else
+ IFFACTORY( ::framework::OpenToolbarController ) else
+ IFFACTORY( ::framework::NewToolbarController ) else
+ IFFACTORY( ::framework::WizardsToolbarController )
)
diff --git a/framework/source/register/registertemp.cxx b/framework/source/register/registertemp.cxx
index 7221950..6429624 100644
--- a/framework/source/register/registertemp.cxx
+++ b/framework/source/register/registertemp.cxx
< at >< at > -66,7 +66,6 < at >< at >
#include <uielement/macrosmenucontroller.hxx>
#include <uielement/newmenucontroller.hxx>
#include <uielement/toolbarsmenucontroller.hxx>
-#include <uielement/popupmenucontroller.hxx>
COMPONENTGETIMPLEMENTATIONENVIRONMENT
< at >< at > -87,6 +86,5 < at >< at > COMPONENTGETFACTORY ( IFFACTORY( ::framework::MediaTypeDetectionHelper
IFFACTORY( ::framework::FooterMenuController ) else
IFFACTORY( ::framework::HeaderMenuController ) else
IFFACTORY( ::framework::LanguageSelectionMenuController ) else
- IFFACTORY( ::framework::Oxt_Handler ) else
- IFFACTORY( ::framework::PopupMenuController )
+ IFFACTORY( ::framework::Oxt_Handler )
)
diff --git a/framework/source/uielement/popupmenucontroller.cxx b/framework/source/uielement/popupmenucontroller.cxx
deleted file mode 100644
index 4c45e4e..0000000
--- a/framework/source/uielement/popupmenucontroller.cxx
+++ /dev/null
< at >< at > -1,244 +0,0 < at >< at >
-/**************************************************************
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- *************************************************************/
-
-
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_framework.hxx"
-
-#include <com/sun/star/awt/XPopupMenu.hpp>
-#include <com/sun/star/frame/XPopupMenuController.hpp>
-
-#include <toolkit/helper/vclunohelper.hxx>
-//#include <toolkit/unohlp.hxx>
-
-#include <rtl/ref.hxx>
-
-#include <vcl/toolbox.hxx>
-#include <vcl/menu.hxx>
-#include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
-
-#include "uielement/popupmenucontroller.hxx"
-#include "services.h"
-
-using rtl::OUString;
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::frame;
-using namespace ::com::sun::star::beans;
-
-// --------------------------------------------------------------------
-
-
-namespace framework
-{
-
-DEFINE_XSERVICEINFO_MULTISERVICE ( PopupMenuController ,
- OWeakObject ,
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ToolbarController" ) ) ,
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.framework.PopupMenuController" ) )
- )
-
-DEFINE_INIT_SERVICE ( PopupMenuController, {} )
-
-class PopupMenuControllerImpl
-{
-};
-
-//========================================================================
-// class PopupMenuController REMOVE REMOVE REMOVE
-//========================================================================
-
-PopupMenuController::PopupMenuController( const Reference< lang::XMultiServiceFactory >& rServiceManager )
-: svt::ToolboxController( rServiceManager, Reference< frame::XFrame >(), OUString() )
-{
-}
-
-// --------------------------------------------------------------------
-
-PopupMenuController::~PopupMenuController()
-{
-}
-
-// --------------------------------------------------------------------
-// XInterface
-// --------------------------------------------------------------------
-
-Any SAL_CALL PopupMenuController::queryInterface( const Type& aType ) throw (RuntimeException)
-{
- Any a( ToolboxController::queryInterface( aType ) );
- if ( a.hasValue() )
- return a;
-
- return ::cppu::queryInterface( aType, static_cast< lang::XServiceInfo* >( this ));
-}
-
-// --------------------------------------------------------------------
-
-void SAL_CALL PopupMenuController::acquire() throw ()
-{
- ToolboxController::acquire();
-}
-
-// --------------------------------------------------------------------
-
-void SAL_CALL PopupMenuController::release() throw ()
-{
- ToolboxController::release();
-}
-
-// --------------------------------------------------------------------
-// XComponent
-// --------------------------------------------------------------------
-
-void SAL_CALL PopupMenuController::dispose() throw (RuntimeException)
-{
- if( mxPopupMenuController.is() )
- {
- Reference< XComponent > xComponent( mxPopupMenuController, UNO_QUERY );
- if( xComponent.is() )
- xComponent->dispose();
- mxPopupMenuController.clear();
- }
-
- mxPopupMenu.clear();
-
- svt::ToolboxController::dispose();
-}
-
-// --------------------------------------------------------------------
-// XStatusListener
-// --------------------------------------------------------------------
-
-void SAL_CALL PopupMenuController::statusChanged( const frame::FeatureStateEvent& rEvent ) throw ( RuntimeException )
-{
- svt::ToolboxController::statusChanged(rEvent);
- enable( rEvent.IsEnabled );
-}
-
-// --------------------------------------------------------------------
-// XToolbarController
-// --------------------------------------------------------------------
-
-void SAL_CALL PopupMenuController::execute( sal_Int16 KeyModifier ) throw (RuntimeException)
-{
- svt::ToolboxController::execute( KeyModifier );
-}
-
-// --------------------------------------------------------------------
-
-void SAL_CALL PopupMenuController::click() throw (RuntimeException)
-{
- svt::ToolboxController::click();
-}
-
-// --------------------------------------------------------------------
-
-void SAL_CALL PopupMenuController::doubleClick() throw (RuntimeException)
-{
- svt::ToolboxController::doubleClick();
-}
-
-// --------------------------------------------------------------------
-
-bool PopupMenuController::CreatePopupMenuController() throw (Exception)
-{
- Reference< XMultiComponentFactory > xPopupMenuControllerRegistration( getServiceManager()->createInstance( SERVICENAME_POPUPMENUCONTROLLERFACTORY ), UNO_QUERY_THROW );
-
- Sequence< Any > aSeq( 2 );
- PropertyValue aPropValue;
-
- aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ModuleIdentifier" ));
- aPropValue.Value <<= getModuleName();
- aSeq[0] <<= aPropValue;
- aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Frame" ));
- aPropValue.Value <<= m_xFrame;
- aSeq[1] <<= aPropValue;
-
- Reference< XPropertySet > xProps( getServiceManager(), UNO_QUERY_THROW );
- Reference< XComponentContext > xComponentContext( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), UNO_QUERY_THROW );
-
- Reference< XPopupMenuController > xPopupMenuController( xPopupMenuControllerRegistration->createInstanceWithArgumentsAndContext( getCommandURL(), aSeq, xComponentContext ), UNO_QUERY );
- if ( xPopupMenuController.is() )
- {
- mxPopupMenuController = xPopupMenuController;
- return true;
- }
- return false;
-}
-
-Reference< awt::XWindow > SAL_CALL PopupMenuController::createPopupWindow() throw (RuntimeException)
-{
- ::vos::OGuard aSolarLock(Application::GetSolarMutex());
-
- Reference< awt::XWindow > xRet;
-
- try
- {
- ToolBox* pToolBox = dynamic_cast< ToolBox* >( VCLUnoHelper::GetWindow( getParent() ) );
- if( !pToolBox )
- return xRet;
-
- // get selected button
- sal_uInt16 nItemId = pToolBox->GetDownItemId();
- if( !nItemId )
- return xRet;
-
- ::Rectangle aRect( pToolBox->GetItemRect( nItemId ) );
-
- if( !mxPopupMenuController.is() && !CreatePopupMenuController() )
- return xRet;
-
- if( !mxPopupMenu.is() )
- {
- mxPopupMenu = Reference< awt::XPopupMenu >( getServiceManager()->createInstance( DECLARE_ASCII( "com.sun.star.awt.PopupMenu" ) ), UNO_QUERY_THROW );
- mxPopupMenuController->setPopupMenu( mxPopupMenu );
- }
- else
- {
- mxPopupMenuController->updatePopupMenu();
-
- }
- pToolBox->SetItemDown( nItemId, sal_True );
- Reference< awt::XWindowPeer > xPeer( getParent(), UNO_QUERY_THROW );
- mxPopupMenu->execute( xPeer, VCLUnoHelper::ConvertToAWTRect( aRect ), 0 );
- pToolBox->SetItemDown( nItemId, sal_False );
- }
- catch( Exception& )
- {
- }
-
- return xRet;
-}
-
-// --------------------------------------------------------------------
-
-Reference< awt::XWindow > SAL_CALL PopupMenuController::createItemWindow( const Reference< awt::XWindow >& /*Parent*/ ) throw (RuntimeException)
-{
- return Reference< awt::XWindow >();
-}
-
-// --------------------------------------------------------------------
-
-}
-
diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx
new file mode 100644
index 0000000..53530b3
--- /dev/null
+++ b/framework/source/uielement/popuptoolbarcontroller.cxx
< at >< at > -0,0 +1,415 < at >< at >
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_framework.hxx"
+
+#include <uielement/popuptoolbarcontroller.hxx>
+#include <comphelper/processfactory.hxx>
+#include <svtools/imagemgr.hxx>
+#include <svtools/miscopt.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
+#include <tools/urlobj.hxx>
+#include <unotools/moduleoptions.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/toolbox.hxx>
+#include <vos/mutex.hxx>
+
+#include <com/sun/star/awt/PopupMenuDirection.hpp>
+#include <com/sun/star/frame/PopupMenuControllerFactory.hpp>
+
+
+#define UNO_COMMAND_RECENT_FILE_LIST ".uno:RecentFileList"
+
+using rtl::OUString;
+namespace css = ::com::sun::star;
+
+namespace framework
+{
+
+PopupMenuToolbarController::PopupMenuToolbarController(
+ const css::uno::Reference< css::uno::XComponentContext >& xContext,
+ const OUString &rPopupCommand )
+ : svt::ToolboxController()
+ , m_xContext( xContext )
+ , m_bHasController( sal_False )
+ , m_aPopupCommand( rPopupCommand )
+{
+}
+
+PopupMenuToolbarController::~PopupMenuToolbarController()
+{
+}
+
+void SAL_CALL PopupMenuToolbarController::dispose()
+throw ( css::uno::RuntimeException )
+{
+ svt::ToolboxController::dispose();
+
+ osl::MutexGuard aGuard( m_aMutex );
+ if( m_xPopupMenuController.is() )
+ {
+ css::uno::Reference< css::lang::XComponent > xComponent(
+ m_xPopupMenuController, css::uno::UNO_QUERY );
+ if( xComponent.is() )
+ {
+ try
+ {
+ xComponent->dispose();
+ }
+ catch (...)
+ {}
+ }
+ m_xPopupMenuController.clear();
+ }
+
+ m_xContext.clear();
+ m_xPopupMenuFactory.clear();
+ m_xPopupMenu.clear();
+}
+
+void SAL_CALL PopupMenuToolbarController::initialize(
+ const css::uno::Sequence< css::uno::Any >& aArguments )
+throw ( css::uno::Exception, css::uno::RuntimeException )
+{
+ ToolboxController::initialize( aArguments );
+
+ osl::MutexGuard aGuard( m_aMutex );
+ if ( !m_aPopupCommand.getLength() )
+ m_aPopupCommand = m_aCommandURL;
+
+ try
+ {
+ m_xPopupMenuFactory.set(
+ css::frame::PopupMenuControllerFactory::create( m_xContext ) );
+ m_bHasController = m_xPopupMenuFactory->hasController(
+ m_aPopupCommand, getModuleName() );
+ }
+ catch (const css::uno::Exception& e)
+ {
+ OSL_TRACE( "PopupMenuToolbarController - caught an exception! %s",
+ rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
+ (void) e;
+ }
+
+ vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+ ToolBox* pToolBox = static_cast< ToolBox* >( VCLUnoHelper::GetWindow( getParent() ) );
+ if ( pToolBox )
+ {
+ ToolBoxItemBits nCurStyle( pToolBox->GetItemBits( m_nToolBoxId ) );
+ ToolBoxItemBits nSetStyle( getDropDownStyle() );
+ pToolBox->SetItemBits( m_nToolBoxId,
+ m_bHasController ?
+ nCurStyle | nSetStyle :
+ nCurStyle & ~nSetStyle );
+ }
+
+}
+
+void SAL_CALL
+PopupMenuToolbarController::statusChanged(
+ const css::frame::FeatureStateEvent& rEvent )
+ throw ( css::uno::RuntimeException )
+{
+ // TODO move to base class
+
+ svt::ToolboxController::statusChanged( rEvent );
+ enable( rEvent.IsEnabled );
+}
+
+css::uno::Reference< css::awt::XWindow > SAL_CALL
+PopupMenuToolbarController::createPopupWindow()
+ throw ( css::uno::RuntimeException )
+{
+ css::uno::Reference< css::awt::XWindow > xRet;
+
+ osl::MutexGuard aGuard( m_aMutex );
+ if ( !m_bHasController )
+ return xRet;
+
+ createPopupMenuController();
+
+ vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+ ToolBox* pToolBox = static_cast< ToolBox* >( VCLUnoHelper::GetWindow( getParent() ) );
+ if ( !pToolBox )
+ return xRet;
+
+ pToolBox->SetItemDown( m_nToolBoxId, sal_True );
+ sal_uInt16 nId = m_xPopupMenu->execute(
+ css::uno::Reference< css::awt::XWindowPeer >( getParent(), css::uno::UNO_QUERY ),
+ VCLUnoHelper::ConvertToAWTRect( pToolBox->GetItemRect( m_nToolBoxId ) ),
+ css::awt::PopupMenuDirection::EXECUTE_DEFAULT );
+ pToolBox->SetItemDown( m_nToolBoxId, sal_False );
+
+ if ( nId )
+ functionExecuted( m_xPopupMenu->getCommand( nId ) );
+
+ return xRet;
+}
+
+void PopupMenuToolbarController::functionExecuted( const OUString &/*rCommand*/)
+{
+}
+
+sal_uInt16 PopupMenuToolbarController::getDropDownStyle() const
+{
+ return TIB_DROPDOWN;
+}
+
+void PopupMenuToolbarController::createPopupMenuController()
+{
+ if( !m_bHasController )
+ return;
+
+ if ( !m_xPopupMenuController.is() )
+ {
+ css::uno::Sequence< css::uno::Any > aArgs( 2 );
+ css::beans::PropertyValue aProp;
+
+ aProp.Name = DECLARE_ASCII( "Frame" );
+ aProp.Value <<= m_xFrame;
+ aArgs[0] <<= aProp;
+
+ aProp.Name = DECLARE_ASCII( "ModuleIdentifier" );
+ aProp.Value <<= getModuleName();
+ aArgs[1] <<= aProp;
+ try
+ {
+ m_xPopupMenu.set(
+ m_xContext->getServiceManager()->createInstanceWithContext(
+ DECLARE_ASCII( "com.sun.star.awt.PopupMenu" ), m_xContext ),
+ css::uno::UNO_QUERY_THROW );
+ m_xPopupMenuController.set(
+ m_xPopupMenuFactory->createInstanceWithArgumentsAndContext(
+ m_aPopupCommand, aArgs, m_xContext), css::uno::UNO_QUERY_THROW );
+
+ m_xPopupMenuController->setPopupMenu( m_xPopupMenu );
+ }
+ catch ( const css::uno::Exception &e )
+ {
+ m_xPopupMenu.clear();
+ OSL_TRACE( "PopupMenuToolbarController - caught an exception! %s",
+ rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
+ (void) e;
+ }
+ }
+}
+
+DEFINE_XSERVICEINFO_MULTISERVICE_2( WizardsToolbarController,
+ ::cppu::OWeakObject,
+ DECLARE_ASCII("com.sun.star.frame.ToolbarController"),
+ DECLARE_ASCII("org.apache.openoffice.comp.framework.WizardsToolbarController")
+ )
+
+DEFINE_INIT_SERVICE( WizardsToolbarController, {} )
+
+WizardsToolbarController::WizardsToolbarController(
+ const css::uno::Reference< css::uno::XComponentContext >& xContext )
+ : PopupMenuToolbarController( xContext )
+{
+}
+
+sal_uInt16 WizardsToolbarController::getDropDownStyle() const
+{
+ return TIB_DROPDOWNONLY;
+}
+
+DEFINE_XSERVICEINFO_MULTISERVICE_2( OpenToolbarController,
+ ::cppu::OWeakObject,
+ DECLARE_ASCII("com.sun.star.frame.ToolbarController"),
+ DECLARE_ASCII("org.apache.openoffice.comp.framework.OpenToolbarController")
+ )
+
+DEFINE_INIT_SERVICE( OpenToolbarController, {} )
+
+OpenToolbarController::OpenToolbarController(
+ const css::uno::Reference< css::uno::XComponentContext >& xContext )
+ : PopupMenuToolbarController( xContext, DECLARE_ASCII( UNO_COMMAND_RECENT_FILE_LIST ) )
+{
+}
+
+
+DEFINE_XSERVICEINFO_MULTISERVICE_2( NewToolbarController,
+ ::cppu::OWeakObject,
+ DECLARE_ASCII("com.sun.star.frame.ToolbarController"),
+ DECLARE_ASCII("org.apache.openoffice.comp.framework.NewToolbarController")
+ )
+
+DEFINE_INIT_SERVICE( NewToolbarController, {} )
+
+NewToolbarController::NewToolbarController(
+ const css::uno::Reference< css::uno::XComponentContext >& xContext )
+ : PopupMenuToolbarController( xContext )
+{
+}
+
+void SAL_CALL
+NewToolbarController::statusChanged(
+ const css::frame::FeatureStateEvent& rEvent )
+ throw ( css::uno::RuntimeException )
+{
+ if ( rEvent.IsEnabled )
+ {
+ OUString aState;
+ rEvent.State >>= aState;
+ // set the image even if the state is not a string
+ // this will set the image of the default module
+ setItemImage( aState );
+ }
+
+ enable( rEvent.IsEnabled );
+}
+
+void NewToolbarController::functionExecuted( const OUString &rCommand )
+{
+ setItemImage( rCommand );
+}
+
+/**
+ it return the existing state of the given URL in the popupmenu of this toolbox control.
+
+ If the given URL can be located as an action command of one menu item of the
+ popup menu of this control, we return sal_True. Otherwhise we return sal_False.
+ Further we return a fallback URL, in case we have to return sal_False. Because
+ the outside code must select a valid item of the popup menu everytime ...
+ and we define it here. By the way this m ethod was written to handle
+ error situations gracefully. E.g. it can be called during creation time
+ but then we have no valid menu. For this case we know another fallback URL.
+ Then we return the private:factory/ URL of the default factory.
+
+ < at >param rPopupMenu
+ pounts to the popup menu, on which item we try to locate the given URL
+ Can be NULL! Search will be supressed then.
+
+ < at >param sURL
+ the URL for searching
+
+ < at >param sFallback
+ contains the fallback URL in case we return FALSE
+ Must point to valid memory!
+
+ < at >param aImage
+ contains the image of the menu for the URL.
+
+ < at >return sal_True - if URL could be located as an item of the popup menu.
+ sal_False - otherwhise.
+*/
+static sal_Bool Impl_ExistURLInMenu(
+ const css::uno::Reference< css::awt::XPopupMenu > &rPopupMenu,
+ OUString &sURL,
+ OUString &sFallback,
+ Image &aImage )
+{
+ sal_Bool bValidFallback( sal_False );
+ sal_uInt16 nCount( 0 );
+ if ( rPopupMenu.is() && ( nCount = rPopupMenu->getItemCount() ) && sURL.getLength() )
+ {
+ for ( sal_uInt16 n = 0; n < nCount; ++n )
+ {
+ sal_uInt16 nId = rPopupMenu->getItemId( n );
+ OUString aCmd( rPopupMenu->getCommand( nId ) );
+
+ if ( !bValidFallback && aCmd.getLength() )
+ {
+ sFallback = aCmd;
+ bValidFallback = sal_True;
+ }
+
+ // match even if the menu command is more detailed
+ // (maybe an additional query) #i28667#
+ if ( aCmd.match( sURL ) )
+ {
+ sURL = aCmd;
+ const css::uno::Reference< css::graphic::XGraphic > xGraphic(
+ rPopupMenu->getItemImage( nId ) );
+ if ( xGraphic.is() )
+ aImage = Image( xGraphic );
+ return sal_True;
+ }
+ }
+ }
+
+ if ( !bValidFallback )
+ {
+ rtl::OUStringBuffer aBuffer;
+ aBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM( "private:factory/" ) );
+ aBuffer.append( SvtModuleOptions().GetDefaultModuleName() );
+ sFallback = aBuffer.makeStringAndClear();
+ }
+
+ return sal_False;
+}
+
+/** We accept URL's here only, which exist as items of our internal popup menu.
+ All other ones will be ignored and a fallback is used.
+ */
+void NewToolbarController::setItemImage( const OUString &rCommand )
+{
+ vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+ ToolBox* pToolBox = static_cast< ToolBox* >( VCLUnoHelper::GetWindow( getParent() ) );
+ if ( !pToolBox )
+ return;
+
+ OUString aURL = rCommand;
+ OUString sFallback;
+ Image aMenuImage;
+
+ sal_Bool bValid( Impl_ExistURLInMenu( m_xPopupMenu, aURL, sFallback, aMenuImage ) );
+ // do not change aURL if Impl_ExistURLInMenu returned sal_False
+ // this allows later initialization of the PopupMenuController on createPopupWindow()
+ // and works even if SvFileInformationManager does not know the module
+ if ( !aURL.getLength() )
+ aURL = sFallback;
+
+ sal_Bool bBig = SvtMiscOptions().AreCurrentSymbolsLarge();
+ sal_Bool bHC = pToolBox->GetSettings().GetStyleSettings().GetHighContrastMode();
+
+ INetURLObject aURLObj( aURL );
+ Image aImage = SvFileInformationManager::GetImageNoDefault( aURLObj, bBig, bHC );
+ if ( !aImage )
+ {
+ if ( !!aMenuImage )
+ aImage = aMenuImage;
+ else if ( !bValid )
+ // If SvFileInformationManager didn't know the module, try with the default
+ aImage = SvFileInformationManager::GetImageNoDefault( INetURLObject( sFallback ), bBig, bHC );
+
+ if ( !aImage )
+ aImage = SvFileInformationManager::GetImage( aURLObj, bBig, bHC );
+ }
+
+ // if everything failed, just use the image associated with the toolbar item command
+ if ( !aImage )
+ return;
+
+ Size aBigSize( pToolBox->GetDefaultImageSize() );
+ if ( bBig && aImage.GetSizePixel() != aBigSize )
+ {
+ BitmapEx aScaleBmpEx( aImage.GetBitmapEx() );
+ aScaleBmpEx.Scale( aBigSize, BMP_SCALE_INTERPOLATE );
+ pToolBox->SetItemImage( m_nToolBoxId, Image( aScaleBmpEx ) );
+ }
+ else
+ pToolBox->SetItemImage( m_nToolBoxId, aImage );
+}
+
+
+}
diff --git a/framework/util/fwk.component b/framework/util/fwk.component
index c41c25b..1e1e17d 100644
--- a/framework/util/fwk.component
+++ b/framework/util/fwk.component
< at >< at > -142,4 +142,13 < at >< at >
<implementation name="com.sun.star.comp.framework.TabWindowService">
<service name="com.sun.star.ui.dialogs.TabContainerWindow"/>
</implementation>
+ <implementation name="org.apache.openoffice.comp.framework.OpenToolbarController">
+ <service name="com.sun.star.frame.ToolbarController"/>
+ </implementation>
+ <implementation name="org.apache.openoffice.comp.framework.NewToolbarController">
+ <service name="com.sun.star.frame.ToolbarController"/>
+ </implementation>
+ <implementation name="org.apache.openoffice.comp.framework.WizardsToolbarController">
+ <service name="com.sun.star.frame.ToolbarController"/>
+ </implementation>
</component>
diff --git a/framework/util/fwl.component b/framework/util/fwl.component
index 4853f6d..d4fda5c 100644
--- a/framework/util/fwl.component
+++ b/framework/util/fwl.component
< at >< at > -63,9 +63,6 < at >< at >
<implementation name="com.sun.star.comp.framework.OXTFileHandler">
<service name="com.sun.star.frame.ContentHandler"/>
</implementation>
- <implementation name="com.sun.star.comp.framework.PopupMenuController">
- <service name="com.sun.star.frame.ToolbarController"/>
- </implementation>
<implementation name="com.sun.star.comp.framework.PopupMenuControllerDispatcher">
<service name="com.sun.star.frame.ProtocolHandler"/>
</implementation>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
index 86c10bb..6b00240 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
< at >< at > -412,6 +412,39 < at >< at >
<value>com.sun.star.svx.UpSearchToolboxController</value>
</prop>
</node>
+ <node oor:name="org.apache.openoffice.comp.framework.OpenToolbarController" oor:op="replace">
+ <prop oor:name="Command">
+ <value>.uno:Open</value>
+ </prop>
+ <prop oor:name="Module">
+ <value/>
+ </prop>
+ <prop oor:name="Controller">
+ <value>org.apache.openoffice.comp.framework.OpenToolbarController</value>
+ </prop>
+ </node>
+ <node oor:name="org.apache.openoffice.comp.framework.NewToolbarController" oor:op="replace">
+ <prop oor:name="Command">
+ <value>.uno:AddDirect</value>
+ </prop>
+ <prop oor:name="Module">
+ <value/>
+ </prop>
+ <prop oor:name="Controller">
+ <value>org.apache.openoffice.comp.framework.NewToolbarController</value>
+ </prop>
+ </node>
+ <node oor:name="org.apache.openoffice.comp.framework.WizardsToolbarController" oor:op="replace">
+ <prop oor:name="Command">
+ <value>.uno:AutoPilotMenu</value>
+ </prop>
+ <prop oor:name="Module">
+ <value/>
+ </prop>
+ <prop oor:name="Controller">
+ <value>org.apache.openoffice.comp.framework.WizardsToolbarController</value>
+ </prop>
+ </node>
</node>
<node oor:name="StatusBar">
<node oor:name="c1" oor:op="replace">
commit c01a6f4f370b72f0751cf4f5c11310682e2b3248
Author: Ariel Constenla-Haile <arielch< at >apache.org>
Date: Sat May 25 22:10:51 2013 +0000
i121542 - css::awt::XPopupMenu::execute() needs a css::awt::Rectangle
diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx
index 3c8dd87..6f3a875 100644
--- a/forms/source/component/ImageControl.cxx
+++ b/forms/source/component/ImageControl.cxx
< at >< at > -925,7 +925,7 < at >< at > void OImageControlControl::mousePressed(const ::com::sun::star::awt::MouseEvent&
if ( impl_isEmptyGraphics_nothrow() )
xMenu->enableItem( ID_CLEAR_GRAPHICS, sal_False );
- awt::Point aPos( e.X, e.Y );
+ awt::Rectangle aRect( e.X, e.Y, 0, 0 );
if ( ( e.X < 0 ) || ( e.Y < 0 ) )
{ // context menu triggered by keyboard
// position it in the center of the control
< at >< at > -935,12 +935,12 < at >< at > void OImageControlControl::mousePressed(const ::com::sun::star::awt::MouseEvent&
if ( xWindow.is() )
{
awt::Rectangle aPosSize = xWindow->getPosSize();
- aPos.X = aPosSize.Width / 2;
- aPos.Y = aPosSize.Height / 2;
+ aRect.X = aPosSize.Width / 2;
+ aRect.Y = aPosSize.Height / 2;
}
}
- const sal_Int16 nResult = xMenu->execute( xWindowPeer, aPos, PopupMenuDirection::EXECUTE_DEFAULT );
+ const sal_Int16 nResult = xMenu->execute( xWindowPeer, aRect, PopupMenuDirection::EXECUTE_DEFAULT );
switch ( nResult )
{
diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx
index b570fd6..c825ee6 100644
--- a/framework/source/uielement/langselectionstatusbarcontroller.cxx
+++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx
< at >< at > -203,7 +203,8 < at >< at > throw (::com::sun::star::uno::RuntimeException)
//
Reference< awt::XWindowPeer > xParent( m_xParentWindow, UNO_QUERY );
- sal_Int16 nId = xPopupMenu->execute( xParent, aPos, com::sun::star::awt::PopupMenuDirection::EXECUTE_UP+16 );
+ com::sun::star::awt::Rectangle aRect( aPos.X, aPos.Y, 0, 0 );
+ sal_Int16 nId = xPopupMenu->execute( xParent, aRect, com::sun::star::awt::PopupMenuDirection::EXECUTE_UP+16 );
//click "More..."
if ( nId && m_xFrame.is() )
{
diff --git a/framework/source/uielement/popupmenucontroller.cxx b/framework/source/uielement/popupmenucontroller.cxx
index 2b9e24a..4c45e4e 100644
--- a/framework/source/uielement/popupmenucontroller.cxx
+++ b/framework/source/uielement/popupmenucontroller.cxx
< at >< at > -66,7 +66,7 < at >< at > class PopupMenuControllerImpl
};
//========================================================================
-// class PopupMenuController
+// class PopupMenuController REMOVE REMOVE REMOVE
//========================================================================
PopupMenuController::PopupMenuController( const Reference< lang::XMultiServiceFactory >& rServiceManager )
< at >< at > -221,7 +221,7 < at >< at > Reference< awt::XWindow > SAL_CALL PopupMenuController::createPopupWindow() thro
}
pToolBox->SetItemDown( nItemId, sal_True );
Reference< awt::XWindowPeer > xPeer( getParent(), UNO_QUERY_THROW );
- mxPopupMenu->execute( xPeer, awt::Point( aRect.getX(), aRect.getY() ), 0 );
+ mxPopupMenu->execute( xPeer, VCLUnoHelper::ConvertToAWTRect( aRect ), 0 );
pToolBox->SetItemDown( nItemId, sal_False );
}
catch( Exception& )
diff --git a/odk/examples/DevelopersGuide/GUI/UnoMenu2.java b/odk/examples/DevelopersGuide/GUI/UnoMenu2.java
index 2212c93..11d49c9 100644
--- a/odk/examples/DevelopersGuide/GUI/UnoMenu2.java
+++ b/odk/examples/DevelopersGuide/GUI/UnoMenu2.java
< at >< at > -20,7 +20,7 < at >< at >
*************************************************************/
import com.sun.star.awt.MouseEvent;
-import com.sun.star.awt.Point;
+import com.sun.star.awt.Rectangle;
import com.sun.star.awt.XControl;
import com.sun.star.awt.XMouseListener;
import com.sun.star.awt.XTopWindow;
< at >< at > -99,7 +99,7 < at >< at > public UnoMenu2(XComponentContext _xContext, XMultiComponentFactory _xMCF) {
public void mousePressed(MouseEvent mouseEvent) {
if (mouseEvent.PopupTrigger){
- Point aPos = new Point(mouseEvent.X, mouseEvent.Y);
+ Rectangle aPos = new Rectangle(mouseEvent.X, mouseEvent.Y, 0, 0);
XControl xControl = (XControl) UnoRuntime.queryInterface(XControl.class, mouseEvent.Source);
getPopupMenu().execute( xControl.getPeer(), aPos, com.sun.star.awt.PopupMenuDirection.EXECUTE_DEFAULT);
}
diff --git a/offapi/com/sun/star/awt/XPopupMenu.idl b/offapi/com/sun/star/awt/XPopupMenu.idl
index 856bf62..ad2998e 100644
--- a/offapi/com/sun/star/awt/XPopupMenu.idl
+++ b/offapi/com/sun/star/awt/XPopupMenu.idl
< at >< at > -23,7 +23,7 < at >< at >
#define __com_sun_star_awt_XPopupMenu_idl__
#include <com/sun/star/awt/KeyEvent.idl>
-#include <com/sun/star/awt/Point.idl>
+#include <com/sun/star/awt/Rectangle.idl>
#include <com/sun/star/awt/XMenu.idl>
#include <com/sun/star/graphic/XGraphic.idl>
< at >< at > -84,7 +84,8 < at >< at > published interface XPopupMenu: XMenu
the parent window.
< at >param Position
- the coordinates where the popup menu should be executed.
+ a <type>Rectangle</type> representing the coordinates system
+ where the popup menu should be executed.
< at >param Direction
the direction in which a popup menu will grow, as specified
< at >< at > -94,7 +95,7 < at >< at > published interface XPopupMenu: XMenu
returns the selected item or <code>0</code>, if cancelled.
*/
short execute( [in] XWindowPeer Parent,
- [in] Point Position,
+ [in] Rectangle Position,
[in] short Direction );
/** queries if the <type>PopupMenu</type> is being.
diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb
index e566943..a6edadf 100644
Binary files a/offapi/type_reference/types.rdb and b/offapi/type_reference/types.rdb differ
diff --git a/qadevOOo/tests/java/ifc/frame/_XPopupMenuController.java b/qadevOOo/tests/java/ifc/frame/_XPopupMenuController.java
index a94ab4d..e97666c 100644
--- a/qadevOOo/tests/java/ifc/frame/_XPopupMenuController.java
+++ b/qadevOOo/tests/java/ifc/frame/_XPopupMenuController.java
< at >< at > -61,7 +61,7 < at >< at > public class _XPopupMenuController extends MultiMethodTest {
System.out.println("enableItem called.");
}
- public short execute(com.sun.star.awt.XWindowPeer xWindowPeer, com.sun.star.awt.Point pos, short param) {
+ public short execute(com.sun.star.awt.XWindowPeer xWindowPeer, com.sun.star.awt.Rectangle pos, short param) {
System.out.println("execute called.");
return 0;
}
diff --git a/toolkit/inc/toolkit/awt/vclxmenu.hxx b/toolkit/inc/toolkit/awt/vclxmenu.hxx
index e8c79b6..4df82c7 100644
--- a/toolkit/inc/toolkit/awt/vclxmenu.hxx
+++ b/toolkit/inc/toolkit/awt/vclxmenu.hxx
< at >< at > -120,7 +120,7 < at >< at > public:
virtual ::sal_Int16 SAL_CALL getDefaultItem( ) throw (css::uno::RuntimeException);
virtual void SAL_CALL checkItem( ::sal_Int16 nItemId, ::sal_Bool bCheck ) throw (css::uno::RuntimeException);
virtual ::sal_Bool SAL_CALL isItemChecked( ::sal_Int16 nItemId ) throw (css::uno::RuntimeException);
- virtual ::sal_Int16 SAL_CALL execute( const css::uno::Reference< css::awt::XWindowPeer >& Parent, const css::awt::Point& Position, ::sal_Int16 Direction ) throw (css::uno::RuntimeException);
+ virtual ::sal_Int16 SAL_CALL execute( const css::uno::Reference< css::awt::XWindowPeer >& Parent, const css::awt::Rectangle& Position, ::sal_Int16 Direction ) throw (css::uno::RuntimeException);
virtual ::sal_Bool SAL_CALL isInExecute( ) throw (css::uno::RuntimeException);
virtual void SAL_CALL endExecute( ) throw (css::uno::RuntimeException);
virtual void SAL_CALL setAcceleratorKeyEvent( ::sal_Int16 nItemId, const css::awt::KeyEvent& aKeyEvent ) throw (css::uno::RuntimeException);
diff --git a/toolkit/source/awt/vclxmenu.cxx b/toolkit/source/awt/vclxmenu.cxx
index 3d6c43a..30f1973 100644
--- a/toolkit/source/awt/vclxmenu.cxx
+++ b/toolkit/source/awt/vclxmenu.cxx
< at >< at > -578,7 +578,7 < at >< at > throw(css::uno::RuntimeException)
sal_Int16 VCLXMenu::execute(
const css::uno::Reference< css::awt::XWindowPeer >& rxWindowPeer,
- const css::awt::Point& rPos,
+ const css::awt::Rectangle& rPos,
sal_Int16 nFlags )
throw(css::uno::RuntimeException)
{
< at >< at > -588,9 +588,8 < at >< at > throw(css::uno::RuntimeException)
sal_Int16 nRet = 0;
if ( mpMenu && IsPopupMenu() )
{
- const ::Point aPoint = VCLPoint( rPos );
nRet = ((PopupMenu*)mpMenu)->Execute( VCLUnoHelper::GetWindow( rxWindowPeer ),
- ::Rectangle(aPoint,aPoint),
+ VCLRectangle( rPos ),
nFlags | POPUPMENU_NOMOUSEUPCLOSE );
}
return nRet;
commit da18984094aa5ae4a66731bf581103298b133738
Author: Ariel Constenla-Haile <arielch< at >apache.org>
Date: Sat May 25 22:10:31 2013 +0000
Recent file list: small fix when no documents
diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx
index cc213d3..3ebf9bd 100644
--- a/framework/source/uielement/recentfilesmenucontroller.cxx
+++ b/framework/source/uielement/recentfilesmenucontroller.cxx
< at >< at > -206,7 +206,9 < at >< at > void RecentFilesMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >
{
// No recent documents => insert "no document" string
pVCLPopupMenu->InsertItem( 1, String( FwkResId( STR_NODOCUMENT ) ) );
- pVCLPopupMenu->EnableItem( 1, sal_False );
+ // Do not disable it, otherwise the Toolbar controller and MenuButton
+ // will display SV_RESID_STRING_NOSELECTIONPOSSIBLE instead of STR_NODOCUMENT
+ pVCLPopupMenu->SetItemBits( 1, pVCLPopupMenu->GetItemBits( 1 ) | MIB_NOSELECT );
}
}
}
commit cbf0812a9bcd4287af1f5db0f2c30caf1508baa6
Author: Ariel Constenla-Haile <arielch< at >apache.org>
Date: Sat May 25 22:10:24 2013 +0000
Recent files menu in the StartModule should be the same as in the menubar
diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx
index b93e9d1..b7cb95a 100644
--- a/framework/source/services/backingwindow.cxx
+++ b/framework/source/services/backingwindow.cxx
< at >< at > -46,6 +46,8 < at >< at >
#include "comphelper/sequenceashashmap.hxx"
#include "comphelper/configurationhelper.hxx"
+#include <toolkit/awt/vclxmenu.hxx>
+
#include "cppuhelper/implbase1.hxx"
#include "rtl/strbuf.hxx"
< at >< at > -58,7 +60,7 < at >< at >
#include "com/sun/star/system/SystemShellExecuteFlags.hpp"
#include "com/sun/star/task/XJobExecutor.hpp"
#include "com/sun/star/util/XStringWidth.hpp"
-
+#include <com/sun/star/frame/PopupMenuControllerFactory.hpp>
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::frame;
< at >< at > -66,6 +68,8 < at >< at > using namespace ::com::sun::star::uno;
using namespace ::com::sun::star;
using namespace framework;
+#define RECENT_FILE_LIST ".uno:RecentFileList"
+
#define WRITER_URL "private:factory/swriter"
#define CALC_URL "private:factory/scalc"
#define IMPRESS_WIZARD_URL "private:factory/simpress?slot=6686"
< at >< at > -150,15 +154,18 < at >< at > BackingWindow::BackingWindow( Window* i_pParent ) :
mnLayoutStyle( 0 ),
mpAccExec( NULL ),
mnBtnPos( 120 ),
- mnBtnTop( 150 ),
- mpRecentMenu( NULL )
+ mnBtnTop( 150 )
{
mnColumnWidth[0] = mnColumnWidth[1] = 0;
mnTextColumnWidth[0] = mnTextColumnWidth[1] = 0;
try
{
- Reference<lang::XMultiServiceFactory> xConfig( comphelper::getProcessServiceFactory()->createInstance(SERVICENAME_CFGPROVIDER),UNO_QUERY);
+ mxContext.set( ::comphelper::getProcessComponentContext(), uno::UNO_SET_THROW );
+
+ Reference<lang::XMultiServiceFactory> xConfig(
+ mxContext->getServiceManager()->createInstanceWithContext(
+ SERVICENAME_CFGPROVIDER, mxContext), UNO_QUERY);
if( xConfig.is() )
{
Sequence<Any> args(1);
< at >< at > -176,9 +183,22 < at >< at > BackingWindow::BackingWindow( Window* i_pParent ) :
mnLayoutStyle = value.get<sal_Int32>();
}
}
+
+ mxPopupMenuFactory.set(
+ frame::PopupMenuControllerFactory::create( mxContext ) );
+ // TODO If there is no PopupMenuController, the button should be a nomral one not a MenuButton
+ if ( mxPopupMenuFactory->hasController(
+ DECLARE_ASCII( RECENT_FILE_LIST ) , SERVICENAME_STARTMODULE ) )
+ {
+ mxPopupMenu.set( mxContext->getServiceManager()->createInstanceWithContext(
+ DECLARE_ASCII( "com.sun.star.awt.PopupMenu" ), mxContext ), uno::UNO_QUERY_THROW );
+ }
}
- catch (Exception& )
+ catch (const Exception& e)
{
+ OSL_TRACE( "BackingWindow - caught an exception! %s",
+ rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
+ (void) e;
}
String aExtHelpText( FwkResId( STR_BACKING_EXTHELP ) );
< at >< at > -244,8 +264,24 < at >< at > BackingWindow::BackingWindow( Window* i_pParent ) :
BackingWindow::~BackingWindow()
{
- delete mpRecentMenu;
delete mpAccExec;
+
+ if( mxPopupMenuController.is() )
+ {
+ Reference< lang::XComponent > xComponent( mxPopupMenuController, UNO_QUERY );
+ if( xComponent.is() )
+ {
+ try
+ {
+ xComponent->dispose();
+ }
+ catch (...)
+ {}
+ }
+ mxPopupMenuController.clear();
+ }
+ mxPopupMenuFactory.clear();
+ mxPopupMenu.clear();
}
void BackingWindow::GetFocus()
< at >< at > -275,117 +311,42 < at >< at > void BackingWindow::DataChanged( const DataChangedEvent& rDCEvt )
void BackingWindow::prepareRecentFileMenu()
{
- if( ! mpRecentMenu )
- mpRecentMenu = new PopupMenu();
- mpRecentMenu->Clear();
- maRecentFiles.clear();
-
- // get recent file list and dispatch arguments
- Sequence< Sequence< PropertyValue > > aHistoryList( SvtHistoryOptions().GetList( ePICKLIST ) );
-
- sal_Int32 nPickListMenuItems = ( aHistoryList.getLength() > 99 ) ? 99 : aHistoryList.getLength();
+ if( ! mxPopupMenu.is() )
+ return;
- if( ( nPickListMenuItems > 0 ) )
+ if ( !mxPopupMenuController.is() )
{
- maRecentFiles.reserve( nPickListMenuItems );
- for ( sal_Int32 i = 0; i < nPickListMenuItems; i++ )
- {
- Sequence< PropertyValue >& rPickListEntry = aHistoryList[i];
- rtl::OUString aURL, aFilter, aFilterOpt, aTitle;
-
- for ( sal_Int32 j = 0; j < rPickListEntry.getLength(); j++ )
- {
- const Any& a = rPickListEntry[j].Value;
-
- if ( rPickListEntry[j].Name == HISTORY_PROPERTYNAME_URL )
- a >>= aURL;
- else if ( rPickListEntry[j].Name == HISTORY_PROPERTYNAME_FILTER )
- {
- a >>= aFilter;
- sal_Int32 nPos = aFilter.indexOf( '|' );
- if ( nPos >= 0 )
- {
- if ( nPos < ( aFilter.getLength() - 1 ) )
- aFilterOpt = aFilter.copy( nPos+1 );
- aFilter = aFilter.copy( 0, nPos-1 );
- }
- }
- else if ( rPickListEntry[j].Name == HISTORY_PROPERTYNAME_TITLE )
- a >>= aTitle;
- }
- maRecentFiles.push_back( LoadRecentFile() );
- maRecentFiles.back().aTargetURL = aURL;
-
- sal_Int32 nArgs = aFilterOpt.getLength() ? 4 : 3;
- Sequence< PropertyValue >& rArgsList( maRecentFiles.back().aArgSeq );
- rArgsList.realloc( nArgs );
+ uno::Sequence< uno::Any > aArgs( 2 );
+ beans::PropertyValue aProp;
- nArgs--;
- rArgsList[nArgs].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterName" ));
- rArgsList[nArgs].Value = makeAny( aFilter );
+ aProp.Name = DECLARE_ASCII( "Frame" );
+ aProp.Value <<= mxFrame;
+ aArgs[0] <<= aProp;
- if( aFilterOpt.getLength() )
- {
- nArgs--;
- rArgsList[nArgs].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterOptions" ));
- rArgsList[nArgs].Value = makeAny( aFilterOpt );
- }
-
- // documents in the picklist will never be opened as templates
- nArgs--;
- rArgsList[nArgs].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "AsTemplate" ));
- rArgsList[nArgs].Value = makeAny( (sal_Bool) sal_False );
-
- nArgs--;
- rArgsList[nArgs].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Referer" ));
- rArgsList[nArgs].Value = makeAny( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:user" ) ) );
-
- // and finally create an entry in the popupmenu
- rtl::OUString aMenuTitle;
- INetURLObject aURLObj( aURL );
-
- if ( aURLObj.GetProtocol() == INET_PROT_FILE )
- {
- // Do handle file URL differently => convert it to a system
- // path and abbreviate it with a special function:
- String aFileSystemPath( aURLObj.getFSysPath( INetURLObject::FSYS_DETECT ) );
-
- rtl::OUString aSystemPath( aFileSystemPath );
- rtl::OUString aCompactedSystemPath;
-
- oslFileError nError = osl_abbreviateSystemPath( aSystemPath.pData, &aCompactedSystemPath.pData, 46, NULL );
- if ( !nError )
- aMenuTitle = String( aCompactedSystemPath );
- else
- aMenuTitle = aSystemPath;
- }
- else
- {
- // Use INetURLObject to abbreviate all other URLs
- Reference< util::XStringWidth > xStringLength( new RecentFilesStringLength() );
- aMenuTitle = aURLObj.getAbbreviated( xStringLength, 46, INetURLObject::DECODE_UNAMBIGUOUS );
- }
- rtl::OUStringBuffer aBuf( aMenuTitle.getLength() + 5 );
- if( i < 9 )
- {
- aBuf.append( sal_Unicode( '~' ) );
- aBuf.append( i+1 );
- }
- else if( i == 9 )
- aBuf.appendAscii( "1~0" );
- else
- aBuf.append( i+1 );
- aBuf.appendAscii( ": " );
- aBuf.append( aMenuTitle );
- mpRecentMenu->InsertItem( static_cast<sal_uInt16>(i+1), aBuf.makeStringAndClear() );
+ aProp.Name = DECLARE_ASCII( "ModuleIdentifier" );
+ aProp.Value <<= SERVICENAME_STARTMODULE;
+ aArgs[1] <<= aProp;
+ try
+ {
+ mxPopupMenuController.set(
+ mxPopupMenuFactory->createInstanceWithArgumentsAndContext(
+ DECLARE_ASCII( RECENT_FILE_LIST ), aArgs, mxContext),
+ uno::UNO_QUERY_THROW );
+ mxPopupMenuController->setPopupMenu( mxPopupMenu );
}
+ catch ( const Exception &e )
+ {
+ OSL_TRACE( "BackingWindow - caught an exception! %s",
+ rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
+ (void) e;
+ }
+
+ PopupMenu *pRecentMenu = NULL;
+ VCLXMenu* pTKMenu = VCLXMenu::GetImplementation( mxPopupMenu );
+ if ( pTKMenu )
+ pRecentMenu = dynamic_cast< PopupMenu * >( pTKMenu->GetMenu() );
+ maOpenButton.SetPopupMenu( pRecentMenu );
}
- else
- {
- String aNoDoc( FwkResId( STR_NODOCUMENT ) );
- mpRecentMenu->InsertItem( 0xffff, aNoDoc );
- }
- maOpenButton.SetPopupMenu( mpRecentMenu );
}
void BackingWindow::initBackground()
< at >< at > -455,7 +416,6 < at >< at > void BackingWindow::initBackground()
loadImage( FwkResId( BMP_BACKING_OPENTEMPLATE ), maTemplateButton );
maOpenButton.SetMenuMode( MENUBUTTON_MENUMODE_TIMED );
- maOpenButton.SetSelectHdl( LINK( this, BackingWindow, SelectHdl ) );
maOpenButton.SetActivateHdl( LINK( this, BackingWindow, ActivateHdl ) );
}
< at >< at > -1026,19 +986,6 < at >< at > IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton )
return 0;
}
-IMPL_LINK( BackingWindow, SelectHdl, Button*, pButton )
-{
- if( pButton == &maOpenButton )
- {
- sal_Int32 nItem = sal_Int32(maOpenButton.GetCurItemId())-1;
- if( nItem >= 0 && nItem < sal_Int32(maRecentFiles.size()) )
- {
- Reference< XDispatchProvider > xFrame( mxFrame, UNO_QUERY );
- dispatchURL( maRecentFiles[nItem].aTargetURL, rtl::OUString(), xFrame, maRecentFiles[nItem].aArgSeq );
- }
- }
- return 0;
-}
IMPL_LINK( BackingWindow, ActivateHdl, Button*, pButton )
{
diff --git a/framework/source/services/backingwindow.hxx b/framework/source/services/backingwindow.hxx
index 5040d89..8728f78 100644
--- a/framework/source/services/backingwindow.hxx
+++ b/framework/source/services/backingwindow.hxx
< at >< at > -35,6 +35,10 < at >< at >
#include "unotools/moduleoptions.hxx"
#include "svtools/acceleratorexecute.hxx"
+#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/frame/XUIControllerFactory.hpp>
+#include <com/sun/star/frame/XPopupMenuController.hpp>
+#include <com/sun/star/awt/XPopupMenu.hpp>
#include "com/sun/star/frame/XDispatchProvider.hpp"
#include "com/sun/star/frame/XDesktop.hpp"
#include "com/sun/star/frame/XFrame.hpp"
< at >< at > -74,16 +78,14 < at >< at > namespace framework
class BackingWindow : public Window
{
- struct LoadRecentFile
- {
- rtl::OUString aTargetURL;
- com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > aArgSeq;
- };
+ com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxContext;
com::sun::star::uno::Reference<com::sun::star::frame::XDesktop> mxDesktop;
com::sun::star::uno::Reference<com::sun::star::frame::XDispatchProvider > mxDesktopDispatchProvider;
com::sun::star::uno::Reference<com::sun::star::frame::XFrame> mxFrame;
- com::sun::star::uno::Reference<com::sun::star::document::XEventBroadcaster> mxBroadcaster;
+ com::sun::star::uno::Reference< com::sun::star::frame::XUIControllerFactory > mxPopupMenuFactory;
+ com::sun::star::uno::Reference< com::sun::star::frame::XPopupMenuController > mxPopupMenuController;
+ com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu > mxPopupMenu;
FixedText maWelcome;
Size maWelcomeSize;
< at >< at > -126,9 +128,6 < at >< at > namespace framework
long mnBtnPos;
long mnBtnTop;
- PopupMenu* mpRecentMenu;
- std::vector< LoadRecentFile > maRecentFiles;
-
static const int nItemId_Extensions = 1;
static const int nItemId_Reg = 2;
static const int nItemId_Info = 3;
< at >< at > -154,7 +153,6 < at >< at > namespace framework
);
DECL_LINK( ClickHdl, Button* );
- DECL_LINK( SelectHdl, Button* );
DECL_LINK( ActivateHdl, Button* );
DECL_LINK( ToolboxHdl, void* );
commit e1687ce159e787d98f79d29a3d2131cca4b6ec71
Author: Ariel Constenla-Haile <arielch< at >apache.org>
Date: Sat May 25 22:10:02 2013 +0000
svt::ToolboxController clean-up
Some small clean-up to use the PopupMenu ToolbarController
diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx
index 8f6b8d0..285f868 100644
--- a/framework/source/uielement/generictoolbarcontroller.cxx
... etc. - the rest is truncated
</pre>
Ariel Constenla-Haile
2013-05-26T00:07:31
-
core.git: Branch 'aoo/trunk' - extensions.lst
http://comments.gmane.org/gmane.comp.documentfoundation.libreoffice.scm/27755
<pre> extensions.lst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b3ed6fe8cdcb98090a434482dc1eb6f6cbdbc869
Author: Andrea Pescetti <pescetti< at >apache.org>
Date: Sat May 25 21:14:04 2013 +0000
Update Swedish dictionary.
diff --git a/extensions.lst b/extensions.lst
index 905169d..dcd1799 100644
--- a/extensions.lst
+++ b/extensions.lst
< at >< at > -117,7 +117,7 < at >< at >
# Swedish.
[ language=sv ]
- 249b3bd3d9de4928ab8c809623dc9c4f http://sourceforge.net/projects/aoo-extensions/files/5959/0/dict-sv.oxt/download "dict-sv.oxt"
+ 32ab4edf1496a7cf5469ee1643eb0128 http://sourceforge.net/projects/aoo-extensions/files/5959/1/dict-sv.oxt/download "dict-sv.oxt"
# Korean.
[ language=ko ]
</pre>
Andrea Pescetti
2013-05-25T22:07:57
-
.: NEWS
http://comments.gmane.org/gmane.comp.documentfoundation.libreoffice.scm/27754
<pre> NEWS | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
New commits:
commit 89abdff7b0dcba8c050ce9ef7f68760511814f2f
Author: Markus Mohrhard <markus.mohrhard< at >googlemail.com>
Date: Sat May 25 23:21:14 2013 +0200
add cppunit 1.13.1 changes to NEWS
diff --git a/NEWS b/NEWS
index efbf5d2..f85f037 100644
--- a/NEWS
+++ b/NEWS
< at >< at > -4,8 +4,16 < at >< at >
* Portability:
- Supports 64 bit build on windows
- - Report errors from dlopen and dlclose on windows through dlerror on
- unix.
+ - Report errors from dlopen and dlclose through dlerror on
+ unix/linux.
+
+ New in CppUnit 1.13.1:
+ ---------------------
+
+* Portability:
+ - Use portable way to use free (fdo#52536)
+
+ - Prevent crash when demangling fails with gcc (fdo#52539)
New in CppUnit 1.13.0:
----------------------
</pre>
Libreoffice Gerrit user
2013-05-25T21:27:41
-
.: Branch 'cppunit-1-13' - 6 commits -configure.in doc/makedox.bat include/cppunit NEWS src/cppunitsrc/CppUnitLibraries2010.sln src/DllPlugInTester src/msvc6
http://comments.gmane.org/gmane.comp.documentfoundation.libreoffice.scm/27753
<pre> NEWS | 17
configure.in | 6
doc/makedox.bat | 2
include/cppunit/Portability.h | 2
src/CppUnitLibraries2010.sln | 66 ++
src/DllPlugInTester/DllPlugInTester.vcxproj | 371 +++++++++++++++
src/cppunit/UnixDynamicLibraryManager.cpp | 6
src/cppunit/cppunit.vcxproj | 105 ++++
src/cppunit/cppunit_dll.vcxproj | 129 +++++
src/msvc6/testpluginrunner/TestPlugInRunner.vcxproj | 159 ++++++
src/msvc6/testrunner/DynamicWindow/cdxCDynamicDialog.cpp | 2
src/msvc6/testrunner/DynamicWindow/cdxCDynamicDialog.h | 2
src/msvc6/testrunner/DynamicWindow/cdxCDynamicWnd.cpp | 2
src/msvc6/testrunner/DynamicWindow/cdxCDynamicWnd.h | 4
src/msvc6/testrunner/TestRunner.vcxproj | 313 ++++++++++++
15 files changed, 1175 insertions(+), 11 deletions(-)
New commits:
commit a91bb3b2b8cc5296a3d3c2f95d44e8d5dfa03224
Author: Markus Mohrhard <markus.mohrhard< at >googlemail.com>
Date: Sat May 25 23:21:14 2013 +0200
add cppunit 1.13.1 changes to NEWS
diff --git a/NEWS b/NEWS
index efbf5d2..f85f037 100644
--- a/NEWS
+++ b/NEWS
< at >< at > -4,8 +4,16 < at >< at >
* Portability:
- Supports 64 bit build on windows
- - Report errors from dlopen and dlclose on windows through dlerror on
- unix.
+ - Report errors from dlopen and dlclose through dlerror on
+ unix/linux.
+
+ New in CppUnit 1.13.1:
+ ---------------------
+
+* Portability:
+ - Use portable way to use free (fdo#52536)
+
+ - Prevent crash when demangling fails with gcc (fdo#52539)
New in CppUnit 1.13.0:
----------------------
commit 36180b7d0b6d012a8be39f82d6f0761f25790eee
Author: Markus Mohrhard <markus.mohrhard< at >googlemail.com>
Date: Sat May 25 23:06:16 2013 +0200
update NEWS file with 1.13.2 changes
diff --git a/NEWS b/NEWS
index 4712771..efbf5d2 100644
--- a/NEWS
+++ b/NEWS
< at >< at > -1,3 +1,12 < at >< at >
+ New in CppUnit 1.13.2:
+ ---------------------
+
+* Portability:
+ - Supports 64 bit build on windows
+
+ - Report errors from dlopen and dlclose on windows through dlerror on
+ unix.
+
New in CppUnit 1.13.0:
----------------------
commit 88e5175fdb41bac4080bc94099dcb8bbd2744ebb
Author: Markus Mohrhard <markus.mohrhard< at >googlemail.com>
Date: Sat May 25 22:49:09 2013 +0200
report dlerror messages on unix
Upstream Libreoffice patch.
diff --git a/src/cppunit/UnixDynamicLibraryManager.cpp b/src/cppunit/UnixDynamicLibraryManager.cpp
index f235cce..4de32cf 100644
--- a/src/cppunit/UnixDynamicLibraryManager.cpp
+++ b/src/cppunit/UnixDynamicLibraryManager.cpp
< at >< at > -34,7 +34,11 < at >< at > DynamicLibraryManager::doFindSymbol( const std::string &symbol )
std::string
DynamicLibraryManager::getLastErrorDetail() const
{
- return "";
+ const char* last_error = ::dlerror();
+ if(last_error)
+ return last_error;
+ else
+ return "";
}
commit a4c615c61d85293e0cfdedc6bb54f2c40c3e8578
Author: Markus Mohrhard <markus.mohrhard< at >googlemail.com>
Date: Sat May 25 19:16:59 2013 +0200
add configuration for 64bit windows builds
diff --git a/src/CppUnitLibraries2010.sln b/src/CppUnitLibraries2010.sln
index 03c58f9..633f721 100644
--- a/src/CppUnitLibraries2010.sln
+++ b/src/CppUnitLibraries2010.sln
< at >< at > -25,73 +25,139 < at >< at > EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug Static|Win32 = Debug Static|Win32
+Debug Static|x64 = Debug Static|x64
Debug Unicode|Win32 = Debug Unicode|Win32
+Debug Unicode|x64 = Debug Unicode|x64
Debug|Win32 = Debug|Win32
+Debug|x64 = Debug|x64
Release Static|Win32 = Release Static|Win32
+Release Static|x64 = Release Static|x64
Release Unicode|Win32 = Release Unicode|Win32
+Release Unicode|x64 = Release Unicode|x64
Release|Win32 = Release|Win32
+Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{26047E59-ECD5-9E22-A3E3-D624038A5572}.Debug Static|Win32.ActiveCfg = Debug Static|Win32
{26047E59-ECD5-9E22-A3E3-D624038A5572}.Debug Static|Win32.Build.0 = Debug Static|Win32
+{26047E59-ECD5-9E22-A3E3-D624038A5572}.Debug Static|x64.ActiveCfg = Debug Static|x64
+{26047E59-ECD5-9E22-A3E3-D624038A5572}.Debug Static|x64.Build.0 = Debug Static|x64
{26047E59-ECD5-9E22-A3E3-D624038A5572}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32
{26047E59-ECD5-9E22-A3E3-D624038A5572}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32
+{26047E59-ECD5-9E22-A3E3-D624038A5572}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64
+{26047E59-ECD5-9E22-A3E3-D624038A5572}.Debug Unicode|x64.Build.0 = Debug Unicode|x64
{26047E59-ECD5-9E22-A3E3-D624038A5572}.Debug|Win32.ActiveCfg = Debug|Win32
{26047E59-ECD5-9E22-A3E3-D624038A5572}.Debug|Win32.Build.0 = Debug|Win32
+{26047E59-ECD5-9E22-A3E3-D624038A5572}.Debug|x64.ActiveCfg = Debug|x64
+{26047E59-ECD5-9E22-A3E3-D624038A5572}.Debug|x64.Build.0 = Debug|x64
{26047E59-ECD5-9E22-A3E3-D624038A5572}.Release Static|Win32.ActiveCfg = Release Static|Win32
{26047E59-ECD5-9E22-A3E3-D624038A5572}.Release Static|Win32.Build.0 = Release Static|Win32
+{26047E59-ECD5-9E22-A3E3-D624038A5572}.Release Static|x64.ActiveCfg = Release Static|x64
+{26047E59-ECD5-9E22-A3E3-D624038A5572}.Release Static|x64.Build.0 = Release Static|x64
{26047E59-ECD5-9E22-A3E3-D624038A5572}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32
{26047E59-ECD5-9E22-A3E3-D624038A5572}.Release Unicode|Win32.Build.0 = Release Unicode|Win32
+{26047E59-ECD5-9E22-A3E3-D624038A5572}.Release Unicode|x64.ActiveCfg = Release Unicode|x64
+{26047E59-ECD5-9E22-A3E3-D624038A5572}.Release Unicode|x64.Build.0 = Release Unicode|x64
{26047E59-ECD5-9E22-A3E3-D624038A5572}.Release|Win32.ActiveCfg = Release|Win32
{26047E59-ECD5-9E22-A3E3-D624038A5572}.Release|Win32.Build.0 = Release|Win32
+{26047E59-ECD5-9E22-A3E3-D624038A5572}.Release|x64.ActiveCfg = Release|x64
+{26047E59-ECD5-9E22-A3E3-D624038A5572}.Release|x64.Build.0 = Release|x64
{8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Debug Static|Win32.ActiveCfg = Debug|Win32
{8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Debug Static|Win32.Build.0 = Debug|Win32
+{8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Debug Static|x64.ActiveCfg = Debug|x64
+{8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Debug Static|x64.Build.0 = Debug|x64
{8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Debug Unicode|Win32.Build.0 = Debug|Win32
+{8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Debug Unicode|x64.ActiveCfg = Debug|x64
+{8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Debug Unicode|x64.Build.0 = Debug|x64
{8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Debug|Win32.ActiveCfg = Debug|Win32
{8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Debug|Win32.Build.0 = Debug|Win32
+{8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Debug|x64.ActiveCfg = Debug|x64
+{8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Debug|x64.Build.0 = Debug|x64
{8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Release Static|Win32.ActiveCfg = Release|Win32
{8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Release Static|Win32.Build.0 = Release|Win32
+{8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Release Static|x64.ActiveCfg = Release|x64
+{8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Release Static|x64.Build.0 = Release|x64
{8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Release Unicode|Win32.ActiveCfg = Release|Win32
{8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Release Unicode|Win32.Build.0 = Release|Win32
+{8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Release Unicode|x64.ActiveCfg = Release|x64
+{8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Release Unicode|x64.Build.0 = Release|x64
{8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Release|Win32.ActiveCfg = Release|Win32
{8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Release|Win32.Build.0 = Release|Win32
+{8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Release|x64.ActiveCfg = Release|x64
+{8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Release|x64.Build.0 = Release|x64
{71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Debug Static|Win32.ActiveCfg = Debug Unicode|Win32
{71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Debug Static|Win32.Build.0 = Debug Unicode|Win32
+{71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Debug Static|x64.ActiveCfg = Debug Unicode|x64
+{71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Debug Static|x64.Build.0 = Debug Unicode|x64
{71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32
{71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32
+{71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64
+{71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Debug Unicode|x64.Build.0 = Debug Unicode|x64
{71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Debug|Win32.ActiveCfg = Debug|Win32
{71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Debug|Win32.Build.0 = Debug|Win32
+{71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Debug|x64.ActiveCfg = Debug|x64
+{71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Debug|x64.Build.0 = Debug|x64
{71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Release Static|Win32.ActiveCfg = Release Unicode|Win32
{71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Release Static|Win32.Build.0 = Release Unicode|Win32
+{71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Release Static|x64.ActiveCfg = Release Unicode|x64
+{71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Release Static|x64.Build.0 = Release Unicode|x64
{71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32
{71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Release Unicode|Win32.Build.0 = Release Unicode|Win32
+{71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Release Unicode|x64.ActiveCfg = Release Unicode|x64
+{71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Release Unicode|x64.Build.0 = Release Unicode|x64
{71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Release|Win32.ActiveCfg = Release|Win32
{71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Release|Win32.Build.0 = Release|Win32
+{71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Release|x64.ActiveCfg = Release|x64
+{71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Release|x64.Build.0 = Release|x64
{338B9353-C5CC-FCA6-A584-73425CEDD569}.Debug Static|Win32.ActiveCfg = Debug|Win32
{338B9353-C5CC-FCA6-A584-73425CEDD569}.Debug Static|Win32.Build.0 = Debug|Win32
+{338B9353-C5CC-FCA6-A584-73425CEDD569}.Debug Static|x64.ActiveCfg = Debug|x64
+{338B9353-C5CC-FCA6-A584-73425CEDD569}.Debug Static|x64.Build.0 = Debug|x64
{338B9353-C5CC-FCA6-A584-73425CEDD569}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{338B9353-C5CC-FCA6-A584-73425CEDD569}.Debug Unicode|Win32.Build.0 = Debug|Win32
+{338B9353-C5CC-FCA6-A584-73425CEDD569}.Debug Unicode|x64.ActiveCfg = Debug|x64
+{338B9353-C5CC-FCA6-A584-73425CEDD569}.Debug Unicode|x64.Build.0 = Debug|x64
{338B9353-C5CC-FCA6-A584-73425CEDD569}.Debug|Win32.ActiveCfg = Debug|Win32
{338B9353-C5CC-FCA6-A584-73425CEDD569}.Debug|Win32.Build.0 = Debug|Win32
+{338B9353-C5CC-FCA6-A584-73425CEDD569}.Debug|x64.ActiveCfg = Debug|x64
+{338B9353-C5CC-FCA6-A584-73425CEDD569}.Debug|x64.Build.0 = Debug|x64
{338B9353-C5CC-FCA6-A584-73425CEDD569}.Release Static|Win32.ActiveCfg = Release|Win32
{338B9353-C5CC-FCA6-A584-73425CEDD569}.Release Static|Win32.Build.0 = Release|Win32
+{338B9353-C5CC-FCA6-A584-73425CEDD569}.Release Static|x64.ActiveCfg = Release|x64
+{338B9353-C5CC-FCA6-A584-73425CEDD569}.Release Static|x64.Build.0 = Release|x64
{338B9353-C5CC-FCA6-A584-73425CEDD569}.Release Unicode|Win32.ActiveCfg = Release|Win32
{338B9353-C5CC-FCA6-A584-73425CEDD569}.Release Unicode|Win32.Build.0 = Release|Win32
+{338B9353-C5CC-FCA6-A584-73425CEDD569}.Release Unicode|x64.ActiveCfg = Release|x64
+{338B9353-C5CC-FCA6-A584-73425CEDD569}.Release Unicode|x64.Build.0 = Release|x64
{338B9353-C5CC-FCA6-A584-73425CEDD569}.Release|Win32.ActiveCfg = Release|Win32
{338B9353-C5CC-FCA6-A584-73425CEDD569}.Release|Win32.Build.0 = Release|Win32
+{338B9353-C5CC-FCA6-A584-73425CEDD569}.Release|x64.ActiveCfg = Release|x64
+{338B9353-C5CC-FCA6-A584-73425CEDD569}.Release|x64.Build.0 = Release|x64
{EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Debug Static|Win32.ActiveCfg = Debug|Win32
{EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Debug Static|Win32.Build.0 = Debug|Win32
+{EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Debug Static|x64.ActiveCfg = Debug|x64
+{EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Debug Static|x64.Build.0 = Debug|x64
{EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Debug Unicode|Win32.Build.0 = Debug|Win32
+{EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Debug Unicode|x64.ActiveCfg = Debug|x64
+{EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Debug Unicode|x64.Build.0 = Debug|x64
{EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Debug|Win32.ActiveCfg = Debug|Win32
{EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Debug|Win32.Build.0 = Debug|Win32
+{EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Debug|x64.ActiveCfg = Debug|x64
+{EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Debug|x64.Build.0 = Debug|x64
{EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Release Static|Win32.ActiveCfg = Release|Win32
{EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Release Static|Win32.Build.0 = Release|Win32
+{EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Release Static|x64.ActiveCfg = Release|x64
+{EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Release Static|x64.Build.0 = Release|x64
{EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Release Unicode|Win32.ActiveCfg = Release|Win32
{EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Release Unicode|Win32.Build.0 = Release|Win32
+{EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Release Unicode|x64.ActiveCfg = Release|x64
+{EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Release Unicode|x64.Build.0 = Release|x64
{EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Release|Win32.ActiveCfg = Release|Win32
{EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Release|Win32.Build.0 = Release|Win32
+{EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Release|x64.ActiveCfg = Release|x64
+{EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/src/DllPlugInTester/DllPlugInTester.vcxproj b/src/DllPlugInTester/DllPlugInTester.vcxproj
index 6a48731..6af947d 100644
--- a/src/DllPlugInTester/DllPlugInTester.vcxproj
+++ b/src/DllPlugInTester/DllPlugInTester.vcxproj
< at >< at > -5,26 +5,50 < at >< at >
<Configuration>Debug Static</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Debug Static|x64">
+ <Configuration>Debug Static</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Debug Unicode|Win32">
<Configuration>Debug Unicode</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Debug Unicode|x64">
+ <Configuration>Debug Unicode</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Release Static|Win32">
<Configuration>Release Static</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Release Static|x64">
+ <Configuration>Release Static</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Release Unicode|Win32">
<Configuration>Release Unicode</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Release Unicode|x64">
+ <Configuration>Release Unicode</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<SccProjectName />
< at >< at > -37,31 +61,61 < at >< at >
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Static|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Static|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
< at >< at > -69,26 +123,50 < at >< at >
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
+ </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
+ </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
+ </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Static|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Static|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
+ </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
+ </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
+ </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">
<OutDir>.\ReleaseUnicode\</OutDir>
< at >< at > -96,35 +174,70 < at >< at >
<LinkIncremental>false</LinkIncremental>
<TargetName>$(ProjectName)u</TargetName>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">
+ <OutDir>.\ReleaseUnicode\</OutDir>
+ <IntDir>.\ReleaseUnicode\</IntDir>
+ <LinkIncremental>false</LinkIncremental>
+ <TargetName>$(ProjectName)u</TargetName>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static|Win32'">
<OutDir>.\Debug\</OutDir>
<IntDir>.\Debug\</IntDir>
<LinkIncremental>false</LinkIncremental>
<TargetName>$(ProjectName)d</TargetName>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static|x64'">
+ <OutDir>.\Debug\</OutDir>
+ <IntDir>.\Debug\</IntDir>
+ <LinkIncremental>false</LinkIncremental>
+ <TargetName>$(ProjectName)d</TargetName>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Static|Win32'">
<OutDir>.\Release\</OutDir>
<IntDir>.\Release\</IntDir>
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Static|x64'">
+ <OutDir>.\Release\</OutDir>
+ <IntDir>.\Release\</IntDir>
+ <LinkIncremental>false</LinkIncremental>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>.\DebugDll\</OutDir>
<IntDir>.\DebugDll\</IntDir>
<LinkIncremental>false</LinkIncremental>
<TargetName>DllPlugInTesterd_dll</TargetName>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <OutDir>.\DebugDll\</OutDir>
+ <IntDir>.\DebugDll\</IntDir>
+ <LinkIncremental>false</LinkIncremental>
+ <TargetName>DllPlugInTesterd_dll</TargetName>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>.\ReleaseDll\</OutDir>
<IntDir>.\ReleaseDll\</IntDir>
<LinkIncremental>false</LinkIncremental>
<TargetName>$(ProjectName)_dll</TargetName>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <OutDir>.\ReleaseDll\</OutDir>
+ <IntDir>.\ReleaseDll\</IntDir>
+ <LinkIncremental>false</LinkIncremental>
+ <TargetName>$(ProjectName)_dll</TargetName>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">
<OutDir>.\DebugUnicode\</OutDir>
<IntDir>.\DebugUnicode\</IntDir>
<LinkIncremental>false</LinkIncremental>
<TargetName>$(ProjectName)ud</TargetName>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">
+ <OutDir>.\DebugUnicode\</OutDir>
+ <IntDir>.\DebugUnicode\</IntDir>
+ <LinkIncremental>false</LinkIncremental>
+ <TargetName>$(ProjectName)ud</TargetName>
+ </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">
<ClCompile>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
< at >< at > -168,6 +281,49 < at >< at >
<AdditionalDependencies>odbc32.lib;odbccp32.lib;cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">
+ <ClCompile>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <StringPooling>true</StringPooling>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <Optimization>MinSpace</Optimization>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <WarningLevel>Level3</WarningLevel>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
+ <DebugInformationFormat>OldStyle</DebugInformationFormat>
+ <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AssemblerListingLocation>.\ReleaseUnicode\</AssemblerListingLocation>
+ <PrecompiledHeaderOutputFile>.\ReleaseUnicode\DllPlugInTester.pch</PrecompiledHeaderOutputFile>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <ObjectFileName>.\ReleaseUnicode\</ObjectFileName>
+ <ProgramDataBaseFileName>.\ReleaseUnicode\</ProgramDataBaseFileName>
+ </ClCompile>
+ <PostBuildEvent>
+ <Command>copy "$(TargetPath)" ..\..\lib\$(TargetName).exe</Command>
+ <Message>Copying target to lib/</Message>
+ </PostBuildEvent>
+ <Midl>
+ <TypeLibraryName>.\ReleaseUnicode\DllPlugInTester.tlb</TypeLibraryName>
+ </Midl>
+ <ResourceCompile>
+ <Culture>0x040c</Culture>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\ReleaseUnicode\DllPlugInTester.bsc</OutputFile>
+ </Bscmake>
+ <Link>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <SubSystem>Console</SubSystem>
+ <OutputFile>ReleaseUnicode\DllPlugInTesteru.exe</OutputFile>
+ <AdditionalLibraryDirectories>../../lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>odbc32.lib;odbccp32.lib;cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static|Win32'">
<ClCompile>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
< at >< at > -212,6 +368,49 < at >< at >
<AdditionalDependencies>odbc32.lib;odbccp32.lib;cppunitd.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static|x64'">
+ <ClCompile>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+ <FunctionLevelLinking>false</FunctionLevelLinking>
+ <Optimization>Disabled</Optimization>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <WarningLevel>Level3</WarningLevel>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
+ <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AssemblerListingLocation>.\Debug\</AssemblerListingLocation>
+ <PrecompiledHeaderOutputFile>.\Debug\DllPlugInTester.pch</PrecompiledHeaderOutputFile>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <ObjectFileName>.\Debug\</ObjectFileName>
+ <ProgramDataBaseFileName>.\Debug\</ProgramDataBaseFileName>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ </ClCompile>
+ <PostBuildEvent>
+ <Command>copy $(TargetPath) ..\..\lib\$(TargetName).exe</Command>
+ <Message>Copying target to lib/</Message>
+ </PostBuildEvent>
+ <Midl>
+ <TypeLibraryName>.\Debug\DllPlugInTester.tlb</TypeLibraryName>
+ </Midl>
+ <ResourceCompile>
+ <Culture>0x040c</Culture>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\Debug\DllPlugInTester.bsc</OutputFile>
+ </Bscmake>
+ <Link>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Console</SubSystem>
+ <OutputFile>Debug\DllPlugInTesterd.exe</OutputFile>
+ <AdditionalLibraryDirectories>../../lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>odbc32.lib;odbccp32.lib;cppunitd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Static|Win32'">
<ClCompile>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
< at >< at > -255,6 +454,49 < at >< at >
<AdditionalDependencies>odbc32.lib;odbccp32.lib;cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Static|x64'">
+ <ClCompile>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <StringPooling>true</StringPooling>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <Optimization>MinSpace</Optimization>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <WarningLevel>Level3</WarningLevel>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
+ <DebugInformationFormat>OldStyle</DebugInformationFormat>
+ <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AssemblerListingLocation>.\Release\</AssemblerListingLocation>
+ <PrecompiledHeaderOutputFile>.\Release\DllPlugInTester.pch</PrecompiledHeaderOutputFile>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <ObjectFileName>.\Release\</ObjectFileName>
+ <ProgramDataBaseFileName>.\Release\</ProgramDataBaseFileName>
+ </ClCompile>
+ <PostBuildEvent>
+ <Command>copy $(TargetPath) ..\..\lib\$(TargetName).exe</Command>
+ <Message>Copying target to lib/</Message>
+ </PostBuildEvent>
+ <Midl>
+ <TypeLibraryName>.\Release\DllPlugInTester.tlb</TypeLibraryName>
+ </Midl>
+ <ResourceCompile>
+ <Culture>0x040c</Culture>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\Release\DllPlugInTester.bsc</OutputFile>
+ </Bscmake>
+ <Link>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <SubSystem>Console</SubSystem>
+ <OutputFile>.\Release\DllPlugInTester.exe</OutputFile>
+ <AdditionalLibraryDirectories>../../lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>odbc32.lib;odbccp32.lib;cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
< at >< at > -299,6 +541,49 < at >< at >
<AdditionalDependencies>odbc32.lib;odbccp32.lib;cppunitd_dll.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+ <FunctionLevelLinking>false</FunctionLevelLinking>
+ <Optimization>Disabled</Optimization>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <WarningLevel>Level3</WarningLevel>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
+ <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;CPPUNIT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AssemblerListingLocation>.\DebugDll\</AssemblerListingLocation>
+ <PrecompiledHeaderOutputFile>.\DebugDll\DllPlugInTester.pch</PrecompiledHeaderOutputFile>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <ObjectFileName>.\DebugDll\</ObjectFileName>
+ <ProgramDataBaseFileName>.\DebugDll\</ProgramDataBaseFileName>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ </ClCompile>
+ <PostBuildEvent>
+ <Command>copy "$(TargetPath)" ..\..\lib\$(TargetName).exe</Command>
+ <Message>Copying target to lib/</Message>
+ </PostBuildEvent>
+ <Midl>
+ <TypeLibraryName>.\DebugDll\DllPlugInTester.tlb</TypeLibraryName>
+ </Midl>
+ <ResourceCompile>
+ <Culture>0x040c</Culture>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\DebugDll\DllPlugInTester.bsc</OutputFile>
+ </Bscmake>
+ <Link>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Console</SubSystem>
+ <OutputFile>DebugDll\DllPlugInTesterd_dll.exe</OutputFile>
+ <AdditionalLibraryDirectories>../../lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>odbc32.lib;odbccp32.lib;cppunitd_dll.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
< at >< at > -342,6 +627,49 < at >< at >
<AdditionalDependencies>odbc32.lib;odbccp32.lib;cppunit_dll.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <StringPooling>true</StringPooling>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <Optimization>MinSpace</Optimization>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <WarningLevel>Level3</WarningLevel>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
+ <DebugInformationFormat>OldStyle</DebugInformationFormat>
+ <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;CPPUNIT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AssemblerListingLocation>.\ReleaseDll\</AssemblerListingLocation>
+ <PrecompiledHeaderOutputFile>.\ReleaseDll\DllPlugInTester.pch</PrecompiledHeaderOutputFile>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <ObjectFileName>.\ReleaseDll\</ObjectFileName>
+ <ProgramDataBaseFileName>.\ReleaseDll\</ProgramDataBaseFileName>
+ </ClCompile>
+ <PostBuildEvent>
+ <Command>copy "$(TargetPath)" ..\..\lib\$(TargetName).exe</Command>
+ <Message>Copying target to lib/</Message>
+ </PostBuildEvent>
+ <Midl>
+ <TypeLibraryName>.\ReleaseDll\DllPlugInTester.tlb</TypeLibraryName>
+ </Midl>
+ <ResourceCompile>
+ <Culture>0x040c</Culture>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\ReleaseDll\DllPlugInTester.bsc</OutputFile>
+ </Bscmake>
+ <Link>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <SubSystem>Console</SubSystem>
+ <OutputFile>ReleaseDll\DllPlugInTester_dll.exe</OutputFile>
+ <AdditionalLibraryDirectories>../../lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>odbc32.lib;odbccp32.lib;cppunit_dll.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">
<ClCompile>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
< at >< at > -386,6 +714,49 < at >< at >
<AdditionalDependencies>odbc32.lib;odbccp32.lib;cppunitd.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">
+ <ClCompile>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+ <FunctionLevelLinking>false</FunctionLevelLinking>
+ <Optimization>Disabled</Optimization>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <WarningLevel>Level3</WarningLevel>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
+ <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AssemblerListingLocation>.\DebugUnicode\</AssemblerListingLocation>
+ <PrecompiledHeaderOutputFile>.\DebugUnicode\DllPlugInTester.pch</PrecompiledHeaderOutputFile>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <ObjectFileName>.\DebugUnicode\</ObjectFileName>
+ <ProgramDataBaseFileName>.\DebugUnicode\</ProgramDataBaseFileName>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ </ClCompile>
+ <PostBuildEvent>
+ <Command>copy "$(TargetPath)" ..\..\lib\$(TargetName).exe</Command>
+ <Message>Copying target to lib/</Message>
+ </PostBuildEvent>
+ <Midl>
+ <TypeLibraryName>.\DebugUnicode\DllPlugInTester.tlb</TypeLibraryName>
+ </Midl>
+ <ResourceCompile>
+ <Culture>0x040c</Culture>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\DebugUnicode\DllPlugInTester.bsc</OutputFile>
+ </Bscmake>
+ <Link>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Console</SubSystem>
+ <OutputFile>DebugUnicode\DllPlugInTesterud.exe</OutputFile>
+ <AdditionalLibraryDirectories>../../lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>odbc32.lib;odbccp32.lib;cppunitd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="CommandLineParser.cpp" />
<ClCompile Include="DllPlugInTester.cpp" />
diff --git a/src/cppunit/cppunit.vcxproj b/src/cppunit/cppunit.vcxproj
index e0a1420..0367d20 100644
--- a/src/cppunit/cppunit.vcxproj
+++ b/src/cppunit/cppunit.vcxproj
< at >< at > -5,10 +5,18 < at >< at >
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<SccProjectName />
< at >< at > -21,11 +29,21 < at >< at >
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
< at >< at > -33,20 +51,37 < at >< at >
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
+ </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
+ </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>.\Release\</OutDir>
<IntDir>.\Release\</IntDir>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <OutDir>.\Release\</OutDir>
+ <IntDir>.\Release\</IntDir>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>.\Debug\</OutDir>
<IntDir>.\Debug\</IntDir>
<TargetName>$(ProjectName)d</TargetName>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <OutDir>.\Debug\</OutDir>
+ <IntDir>.\Debug\</IntDir>
+ <TargetName>$(ProjectName)d</TargetName>
+ </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
< at >< at > -82,6 +117,41 < at >< at >
<OutputFile>.\Release\cppunit.lib</OutputFile>
</Lib>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <StringPooling>true</StringPooling>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <Optimization>MaxSpeed</Optimization>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <WarningLevel>Level3</WarningLevel>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
+ <DebugInformationFormat>OldStyle</DebugInformationFormat>
+ <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>NDEBUG;_LIB;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AssemblerListingLocation>.\Release\</AssemblerListingLocation>
+ <PrecompiledHeaderOutputFile>.\Release\cppunit.pch</PrecompiledHeaderOutputFile>
+ <ObjectFileName>.\Release\</ObjectFileName>
+ <ProgramDataBaseFileName>.\Release\</ProgramDataBaseFileName>
+ </ClCompile>
+ <PostBuildEvent>
+ <Command>copy "$(TargetPath)" ..\..\lib\$(TargetName).lib</Command>
+ <Message>Copying target to lib/</Message>
+ </PostBuildEvent>
+ <ResourceCompile>
+ <Culture>0x040c</Culture>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\Release\cppunit.bsc</OutputFile>
+ </Bscmake>
+ <Lib>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\Release\cppunit.lib</OutputFile>
+ </Lib>
+ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
< at >< at > -117,6 +187,40 < at >< at >
<OutputFile>Debug\$(TargetName).lib</OutputFile>
</Lib>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+ <FunctionLevelLinking>false</FunctionLevelLinking>
+ <Optimization>Disabled</Optimization>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <WarningLevel>Level3</WarningLevel>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
+ <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_DEBUG;_LIB;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AssemblerListingLocation>.\Debug\</AssemblerListingLocation>
+ <PrecompiledHeaderOutputFile>.\Debug\cppunit.pch</PrecompiledHeaderOutputFile>
+ <ObjectFileName>.\Debug\</ObjectFileName>
+ <ProgramDataBaseFileName>.\Debug\</ProgramDataBaseFileName>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ </ClCompile>
+ <PostBuildEvent>
+ <Command>copy "$(TargetPath)" ..\..\lib\$(TargetName).lib</Command>
+ <Message>Copying target to lib/</Message>
+ </PostBuildEvent>
+ <ResourceCompile>
+ <Culture>0x040c</Culture>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\Debug\cppunit.bsc</OutputFile>
+ </Bscmake>
+ <Lib>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>Debug\$(TargetName).lib</OutputFile>
+ </Lib>
+ </ItemDefinitionGroup>
<ItemGroup>
<CustomBuild Include="..\..\ChangeLog">
<FileType>Document</FileType>
< at >< at > -168,6 +272,7 < at >< at >
<ClCompile Include="TextOutputter.cpp" />
<ClCompile Include="XmlOutputter.cpp">
<WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level3</WarningLevel>
+ <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level3</WarningLevel>
</ClCompile>
<ClCompile Include="XmlOutputterHook.cpp" />
<ClCompile Include="AdditionalMessage.cpp" />
diff --git a/src/cppunit/cppunit_dll.vcxproj b/src/cppunit/cppunit_dll.vcxproj
index 2101923..292e62f 100644
--- a/src/cppunit/cppunit_dll.vcxproj
+++ b/src/cppunit/cppunit_dll.vcxproj
< at >< at > -5,10 +5,18 < at >< at >
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<SccProjectName />
< at >< at > -21,11 +29,21 < at >< at >
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
< at >< at > -33,10 +51,18 < at >< at >
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
+ </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
+ </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>.\DebugDll\</OutDir>
< at >< at > -44,11 +70,22 < at >< at >
<LinkIncremental>true</LinkIncremental>
<TargetName>cppunitd_dll</TargetName>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <OutDir>.\DebugDll\</OutDir>
+ <IntDir>.\DebugDll\</IntDir>
+ <LinkIncremental>true</LinkIncremental>
+ <TargetName>cppunitd_dll</TargetName>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>.\ReleaseDll\</OutDir>
<IntDir>.\ReleaseDll\</IntDir>
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <OutDir>.\ReleaseDll\</OutDir>
+ <IntDir>.\ReleaseDll\</IntDir>
+ <LinkIncremental>false</LinkIncremental>
+ </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
< at >< at > -97,6 +134,52 < at >< at > copy "$(TargetDir)$(TargetName).lib" ..\..\lib\$(TargetName).lib</Command>
<AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+ <FunctionLevelLinking>false</FunctionLevelLinking>
+ <Optimization>Disabled</Optimization>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <WarningLevel>Level3</WarningLevel>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
+ <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;CPPUNIT_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AssemblerListingLocation>.\DebugDll\</AssemblerListingLocation>
+ <PrecompiledHeaderOutputFile>.\DebugDll\cppunit_dll.pch</PrecompiledHeaderOutputFile>
+ <ObjectFileName>.\DebugDll\</ObjectFileName>
+ <ProgramDataBaseFileName>.\DebugDll\</ProgramDataBaseFileName>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ </ClCompile>
+ <PostBuildEvent>
+ <Command>copy "$(TargetPath)" ..\..\lib\$(TargetName).dll
+copy "$(TargetDir)$(TargetName).lib" ..\..\lib\$(TargetName).lib</Command>
+ <Message>Copying target to lib/</Message>
+ </PostBuildEvent>
+ <Midl>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <TypeLibraryName>.\DebugDll\cppunit_dll.tlb</TypeLibraryName>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ </Midl>
+ <ResourceCompile>
+ <Culture>0x040c</Culture>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\DebugDll\cppunit_dll.bsc</OutputFile>
+ </Bscmake>
+ <Link>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <LinkDLL>true</LinkDLL>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Console</SubSystem>
+ <OutputFile>DebugDll\cppunitd_dll.dll</OutputFile>
+ <ImportLibrary>.\DebugDll\cppunitd_dll.lib</ImportLibrary>
+ <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
< at >< at > -144,6 +227,52 < at >< at > copy "$(TargetDir)$(TargetName).lib" ..\..\lib\$(TargetName).lib</Command>
<AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <StringPooling>true</StringPooling>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <Optimization>MaxSpeed</Optimization>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <WarningLevel>Level3</WarningLevel>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
+ <DebugInformationFormat>OldStyle</DebugInformationFormat>
+ <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CPPUNIT_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AssemblerListingLocation>.\ReleaseDll\</AssemblerListingLocation>
+ <PrecompiledHeaderOutputFile>.\ReleaseDll\cppunit_dll.pch</PrecompiledHeaderOutputFile>
+ <ObjectFileName>.\ReleaseDll\</ObjectFileName>
+ <ProgramDataBaseFileName>.\ReleaseDll\</ProgramDataBaseFileName>
+ </ClCompile>
+ <PostBuildEvent>
+ <Command>copy "$(TargetPath)" ..\..\lib\$(TargetName).dll
+copy "$(TargetDir)$(TargetName).lib" ..\..\lib\$(TargetName).lib</Command>
+ <Message>Copying target to lib/</Message>
+ </PostBuildEvent>
+ <Midl>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <TypeLibraryName>.\ReleaseDll\cppunit_dll.tlb</TypeLibraryName>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ </Midl>
+ <ResourceCompile>
+ <Culture>0x040c</Culture>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\ReleaseDll\cppunit_dll.bsc</OutputFile>
+ </Bscmake>
+ <Link>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <LinkDLL>true</LinkDLL>
+ <SubSystem>Console</SubSystem>
+ <OutputFile>.\ReleaseDll\cppunit_dll.dll</OutputFile>
+ <ImportLibrary>.\ReleaseDll\cppunit_dll.lib</ImportLibrary>
+ <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="DllMain.cpp" />
<ClCompile Include="RepeatedTest.cpp" />
diff --git a/src/msvc6/testpluginrunner/TestPlugInRunner.vcxproj b/src/msvc6/testpluginrunner/TestPlugInRunner.vcxproj
index 97955e8..91defd0 100644
--- a/src/msvc6/testpluginrunner/TestPlugInRunner.vcxproj
+++ b/src/msvc6/testpluginrunner/TestPlugInRunner.vcxproj
< at >< at > -5,10 +5,18 < at >< at >
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<SccProjectName />
< at >< at > -22,11 +30,21 < at >< at >
<UseOfMfc>Dynamic</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseOfMfc>Dynamic</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseOfMfc>Dynamic</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
< at >< at > -34,22 +52,41 < at >< at >
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
+ </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
+ </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>.\Release\</OutDir>
<IntDir>.\Release\</IntDir>
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <OutDir>.\Release\</OutDir>
+ <IntDir>.\Release\</IntDir>
+ <LinkIncremental>false</LinkIncremental>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>.\Debug\</OutDir>
<IntDir>.\Debug\</IntDir>
<LinkIncremental>false</LinkIncremental>
<TargetName>$(ProjectName)d</TargetName>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <OutDir>.\Debug\</OutDir>
+ <IntDir>.\Debug\</IntDir>
+ <LinkIncremental>false</LinkIncremental>
+ <TargetName>$(ProjectName)d</TargetName>
+ </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
< at >< at > -97,6 +134,52 < at >< at >
<AdditionalDependencies>cppunit_dll.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <StringPooling>true</StringPooling>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <Optimization>MaxSpeed</Optimization>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <WarningLevel>Level3</WarningLevel>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
+ <DebugInformationFormat>OldStyle</DebugInformationFormat>
+ <AdditionalIncludeDirectories>../../include;../TestRunner;..\..\..\include;..\..\..\include\msvc6;..\TestRunner;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;CPPUNIT_SUBCLASSING_TESTRUNNERDLG_BUILD;CPPUNIT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AssemblerListingLocation>.\Release\</AssemblerListingLocation>
+ <PrecompiledHeaderOutputFile>.\Release\TestPlugInRunner.pch</PrecompiledHeaderOutputFile>
+ <PrecompiledHeader>Use</PrecompiledHeader>
+ <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
+ <ObjectFileName>.\Release\</ObjectFileName>
+ <ProgramDataBaseFileName>.\Release\</ProgramDataBaseFileName>
+ </ClCompile>
+ <PostBuildEvent>
+ <Command>copy "$(TargetPath)" ..\..\..\lib\$(TargetName).exe</Command>
+ <Message>Copying target to lib/</Message>
+ </PostBuildEvent>
+ <Midl>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <TypeLibraryName>.\Release\TestPlugInRunner.tlb</TypeLibraryName>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ </Midl>
+ <ResourceCompile>
+ <Culture>0x040c</Culture>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\Release\TestPlugInRunner.bsc</OutputFile>
+ </Bscmake>
+ <Link>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <SubSystem>Windows</SubSystem>
+ <OutputFile>.\Release\TestPlugInRunner.exe</OutputFile>
+ <AdditionalLibraryDirectories>../../../lib/;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>cppunit_dll.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
< at >< at > -145,6 +228,52 < at >< at >
<AdditionalDependencies>cppunitd_dll.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+ <FunctionLevelLinking>false</FunctionLevelLinking>
+ <Optimization>Disabled</Optimization>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <WarningLevel>Level3</WarningLevel>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
+ <AdditionalIncludeDirectories>..\..\..\include;..\..\..\include\msvc6;..\TestRunner;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_DEBUG;CPPUNIT_TESTPLUGINRUNNER_BUILD;WIN32;_WINDOWS;CPPUNIT_SUBCLASSING_TESTRUNNERDLG_BUILD;CPPUNIT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AssemblerListingLocation>.\Debug\</AssemblerListingLocation>
+ <PrecompiledHeaderOutputFile>.\Debug\TestPlugInRunner.pch</PrecompiledHeaderOutputFile>
+ <PrecompiledHeader>Use</PrecompiledHeader>
+ <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
+ <ObjectFileName>.\Debug\</ObjectFileName>
+ <ProgramDataBaseFileName>.\Debug\</ProgramDataBaseFileName>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ </ClCompile>
+ <PostBuildEvent>
+ <Command>copy "$(TargetPath)" ..\..\..\lib\$(TargetName).exe</Command>
+ <Message>Copying target to lib/</Message>
+ </PostBuildEvent>
+ <Midl>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <TypeLibraryName>.\Debug\TestPlugInRunner.tlb</TypeLibraryName>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ </Midl>
+ <ResourceCompile>
+ <Culture>0x040c</Culture>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\Debug\TestPlugInRunner.bsc</OutputFile>
+ </Bscmake>
+ <Link>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ <OutputFile>Debug/TestPlugInRunnerd.exe</OutputFile>
+ <AdditionalLibraryDirectories>../../../lib/;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>cppunitd_dll.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
<ItemGroup>
<CustomBuild Include="res\errortype.bmp" />
<CustomBuild Include="res\ico00001.ico" />
< at >< at > -161,26 +290,38 < at >< at >
<CustomBuild Include="..\..\..\lib\cppunit_dll.dll">
<FileType>Document</FileType>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(FullPath) $(IntDir)%(Filename).dll</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy %(FullPath) $(IntDir)%(Filename).dll</Command>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Updating %(FullPath)</Message>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Updating %(FullPath)</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)\$(InputName).dll;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)\$(InputName).dll;%(Outputs)</Outputs>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</CustomBuild>
<CustomBuild Include="..\..\..\lib\cppunitd_dll.dll">
<FileType>Document</FileType>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(IntDir)%(Filename).dll</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy %(FullPath) $(IntDir)%(Filename).dll</Command>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Updating %(FullPath)</Message>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Updating %(FullPath)</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)\$(InputName).dll;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)\$(InputName).dll;%(Outputs)</Outputs>
</CustomBuild>
<CustomBuild Include="..\..\..\lib\testrunner.dll">
<FileType>Document</FileType>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</CustomBuild>
<CustomBuild Include="..\..\..\lib\testrunnerd.dll">
<FileType>Document</FileType>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</CustomBuild>
<CustomBuild Include="ReadMe.txt" />
</ItemGroup>
< at >< at > -217,9 +358,13 < at >< at >
<ItemGroup>
<ClCompile Include="StdAfx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
<PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">stdafx.h</PrecompiledHeaderFile>
+ <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">stdafx.h</PrecompiledHeaderFile>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
<PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">stdafx.h</PrecompiledHeaderFile>
+ <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">stdafx.h</PrecompiledHeaderFile>
</ClCompile>
<ClCompile Include="TestPlugInRunnerApp.cpp" />
<ClCompile Include="TestPlugInRunnerDlg.cpp" />
< at >< at > -228,27 +373,37 < at >< at >
<ClCompile Include="TestPlugInRunnerModel.cpp" />
<ClCompile Include="..\testrunner\DynamicWindow\cdxCDynamicBar.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\testrunner\DynamicWindow\cdxCDynamicControlsManager.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\testrunner\DynamicWindow\cdxCDynamicDialog.cpp" />
<ClCompile Include="..\testrunner\DynamicWindow\cdxCDynamicFormView.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\testrunner\DynamicWindow\cdxCDynamicPropSheet.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\testrunner\DynamicWindow\cdxCDynamicWnd.cpp" />
<ClCompile Include="..\testrunner\DynamicWindow\cdxCDynamicWndEx.cpp" />
<ClCompile Include="..\testrunner\DynamicWindow\cdxCSizeIconCtrl.cpp" />
<ClCompile Include="..\testrunner\DynamicWindow\SizeCBar.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\testrunner\ListCtrlFormatter.cpp" />
<ClCompile Include="..\testrunner\ListCtrlSetter.cpp" />
< at >< at > -263,8 +418,12 < at >< at >
<ClCompile Include="..\..\..\include\msvc6\DSPlugin\TestRunnerDSPluginVC6_i.c">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ </PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ </PrecompiledHeader>
</ClCompile>
</ItemGroup>
<ItemGroup>
diff --git a/src/msvc6/testrunner/TestRunner.vcxproj b/src/msvc6/testrunner/TestRunner.vcxproj
index 6875ecc..320dc85 100644
--- a/src/msvc6/testrunner/TestRunner.vcxproj
+++ b/src/msvc6/testrunner/TestRunner.vcxproj
< at >< at > -5,18 +5,34 < at >< at >
<Configuration>Debug Unicode</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Debug Unicode|x64">
+ <Configuration>Debug Unicode</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Release Unicode|Win32">
<Configuration>Release Unicode</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Release Unicode|x64">
+ <Configuration>Release Unicode</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<SccProjectName />
< at >< at > -29,20 +45,38 < at >< at >
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>Dynamic</UseOfMfc>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>Dynamic</UseOfMfc>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>Dynamic</UseOfMfc>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>Dynamic</UseOfMfc>
+ </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
< at >< at > -50,18 +84,34 < at >< at >
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
+ </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
+ </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
+ </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
+ </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>.\Debug\</OutDir>
< at >< at > -69,23 +119,46 < at >< at >
<LinkIncremental>false</LinkIncremental>
<TargetName>testrunnerd</TargetName>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <OutDir>.\Debug\</OutDir>
+ <IntDir>.\Debug\</IntDir>
+ <LinkIncremental>false</LinkIncremental>
+ <TargetName>testrunnerd</TargetName>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">
<OutDir>.\ReleaseUnicode\</OutDir>
<IntDir>.\ReleaseUnicode\</IntDir>
<LinkIncremental>false</LinkIncremental>
<TargetName>testrunneru</TargetName>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">
+ <OutDir>.\ReleaseUnicode\</OutDir>
+ <IntDir>.\ReleaseUnicode\</IntDir>
+ <LinkIncremental>false</LinkIncremental>
+ <TargetName>testrunneru</TargetName>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">
<OutDir>.\DebugUnicode\</OutDir>
<IntDir>.\DebugUnicode\</IntDir>
<LinkIncremental>false</LinkIncremental>
<TargetName>testrunnerud</TargetName>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">
+ <OutDir>.\DebugUnicode\</OutDir>
+ <IntDir>.\DebugUnicode\</IntDir>
+ <LinkIncremental>false</LinkIncremental>
+ <TargetName>testrunnerud</TargetName>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>.\Release\</OutDir>
<IntDir>.\Release\</IntDir>
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <OutDir>.\Release\</OutDir>
+ <IntDir>.\Release\</IntDir>
+ <LinkIncremental>false</LinkIncremental>
+ </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
< at >< at > -138,6 +211,56 < at >< at > copy "$(TargetDir)$(TargetName).lib" ..\..\..\lib\$(TargetName).lib</Command>
<AdditionalDependencies>..\..\..\lib\cppunitd.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+ <FunctionLevelLinking>false</FunctionLevelLinking>
+ <Optimization>Disabled</Optimization>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <WarningLevel>Level3</WarningLevel>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
+ <AdditionalIncludeDirectories>..\..\..\include;..\..\..\include\msvc6;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_DEBUG;_AFXEXT;_WINDOWS;_WINDLL;WIN32;OEMRESOURCE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AssemblerListingLocation>.\Debug\</AssemblerListingLocation>
+ <BrowseInformation>true</BrowseInformation>
+ <PrecompiledHeaderOutputFile>.\Debug\TestRunner.pch</PrecompiledHeaderOutputFile>
+ <PrecompiledHeader>Use</PrecompiledHeader>
+ <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
+ <ObjectFileName>.\Debug\</ObjectFileName>
+ <ProgramDataBaseFileName>.\Debug\</ProgramDataBaseFileName>
+ </ClCompile>
+ <PostBuildEvent>
+ <Command>copy "$(TargetPath)" ..\..\..\lib\$(TargetName).dll
+copy "$(TargetDir)$(TargetName).lib" ..\..\..\lib\$(TargetName).lib</Command>
+ <Message>Copying target to lib/</Message>
+ </PostBuildEvent>
+ <Midl>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <TypeLibraryName>.\Debug\TestRunner.tlb</TypeLibraryName>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <RedirectOutputAndErrors>NUL</RedirectOutputAndErrors>
+ </Midl>
+ <ResourceCompile>
+ <Culture>0x0409</Culture>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\Debug\TestRunner.bsc</OutputFile>
+ </Bscmake>
+ <Link>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <LinkDLL>true</LinkDLL>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ <ModuleDefinitionFile>.\TestRunner.def</ModuleDefinitionFile>
+ <OutputFile>Debug\testrunnerd.dll</OutputFile>
+ <ImportLibrary>.\Debug\testrunnerd.lib</ImportLibrary>
+ <AdditionalDependencies>..\..\..\lib\cppunitd.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">
<ClCompile>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
< at >< at > -189,6 +312,56 < at >< at > copy "$(TargetDir)$(TargetName).lib" ..\..\..\lib\$(TargetName).lib</Command>
<AdditionalDependencies>..\..\..\lib\cppunit.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">
+ <ClCompile>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <StringPooling>true</StringPooling>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <Optimization>MaxSpeed</Optimization>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <WarningLevel>Level3</WarningLevel>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
+ <DebugInformationFormat>OldStyle</DebugInformationFormat>
+ <AdditionalIncludeDirectories>..\..\..\include;..\..\..\include\msvc6;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>NDEBUG;_AFXEXT;_WINDOWS;_WINDLL;WIN32;OEMRESOURCE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AssemblerListingLocation>.\ReleaseUnicode\</AssemblerListingLocation>
+ <PrecompiledHeaderOutputFile>.\ReleaseUnicode\TestRunner.pch</PrecompiledHeaderOutputFile>
+ <PrecompiledHeader>Use</PrecompiledHeader>
+ <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
+ <ObjectFileName>.\ReleaseUnicode\</ObjectFileName>
+ <ProgramDataBaseFileName>.\ReleaseUnicode\</ProgramDataBaseFileName>
+ </ClCompile>
+ <PostBuildEvent>
+ <Command>copy "$(TargetPath)" ..\..\..\lib\$(TargetName).dll
+copy "$(TargetDir)$(TargetName).lib" ..\..\..\lib\$(TargetName).lib</Command>
+ <Message>Copying target to lib/</Message>
+ </PostBuildEvent>
+ <Midl>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <TypeLibraryName>.\ReleaseUnicode\TestRunner.tlb</TypeLibraryName>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <RedirectOutputAndErrors>NUL</RedirectOutputAndErrors>
+ </Midl>
+ <ResourceCompile>
+ <Culture>0x0409</Culture>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\ReleaseUnicode\TestRunner.bsc</OutputFile>
+ </Bscmake>
+ <Link>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <LinkDLL>true</LinkDLL>
+ <SubSystem>Windows</SubSystem>
+ <ModuleDefinitionFile>.\TestRunner.def</ModuleDefinitionFile>
+ <OutputFile>ReleaseUnicode\testrunneru.dll</OutputFile>
+ <ImportLibrary>.\ReleaseUnicode\testrunneru.lib</ImportLibrary>
+ <AdditionalDependencies>..\..\..\lib\cppunit.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">
<ClCompile>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
< at >< at > -241,6 +414,56 < at >< at > copy "$(TargetDir)$(TargetName).lib" ..\..\..\lib\$(TargetName).lib</Command>
<AdditionalDependencies>..\..\..\lib\cppunitd.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">
+ <ClCompile>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+ <FunctionLevelLinking>false</FunctionLevelLinking>
+ <Optimization>Disabled</Optimization>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <WarningLevel>Level3</WarningLevel>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
+ <AdditionalIncludeDirectories>..\..\..\include;..\..\..\include\msvc6;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_DEBUG;_AFXEXT;_WINDOWS;_WINDLL;WIN32;OEMRESOURCE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AssemblerListingLocation>.\DebugUnicode\</AssemblerListingLocation>
+ <BrowseInformation>true</BrowseInformation>
+ <PrecompiledHeaderOutputFile>.\DebugUnicode\TestRunner.pch</PrecompiledHeaderOutputFile>
+ <PrecompiledHeader>Use</PrecompiledHeader>
+ <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
+ <ObjectFileName>.\DebugUnicode\</ObjectFileName>
+ <ProgramDataBaseFileName>.\DebugUnicode\</ProgramDataBaseFileName>
+ </ClCompile>
+ <PostBuildEvent>
+ <Command>copy "$(TargetPath)" ..\..\..\lib\$(TargetName).dll
+copy "$(TargetDir)$(TargetName).lib" ..\..\..\lib\$(TargetName).lib</Command>
+ <Message>Copying target to lib/</Message>
+ </PostBuildEvent>
+ <Midl>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <TypeLibraryName>.\DebugUnicode\TestRunner.tlb</TypeLibraryName>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <RedirectOutputAndErrors>NUL</RedirectOutputAndErrors>
+ </Midl>
+ <ResourceCompile>
+ <Culture>0x0409</Culture>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\DebugUnicode\TestRunner.bsc</OutputFile>
+ </Bscmake>
+ <Link>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <LinkDLL>true</LinkDLL>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ <ModuleDefinitionFile>.\TestRunner.def</ModuleDefinitionFile>
+ <OutputFile>DebugUnicode\testrunnerud.dll</OutputFile>
+ <ImportLibrary>.\DebugUnicode\testrunnerud.lib</ImportLibrary>
+ <AdditionalDependencies>..\..\..\lib\cppunitd.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
< at >< at > -292,6 +515,56 < at >< at > copy "$(TargetDir)$(TargetName).lib" ..\..\..\lib\$(TargetName).lib</Command>
<AdditionalDependencies>..\..\..\lib\cppunit.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <StringPooling>true</StringPooling>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <Optimization>MaxSpeed</Optimization>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <WarningLevel>Level3</WarningLevel>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
+ <DebugInformationFormat>OldStyle</DebugInformationFormat>
+ <AdditionalIncludeDirectories>..\..\..\include;..\..\..\include\msvc6;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>NDEBUG;_AFXEXT;_WINDOWS;_WINDLL;WIN32;OEMRESOURCE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AssemblerListingLocation>.\Release\</AssemblerListingLocation>
+ <PrecompiledHeaderOutputFile>.\Release\TestRunner.pch</PrecompiledHeaderOutputFile>
+ <PrecompiledHeader>Use</PrecompiledHeader>
+ <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
+ <ObjectFileName>.\Release\</ObjectFileName>
+ <ProgramDataBaseFileName>.\Release\</ProgramDataBaseFileName>
+ </ClCompile>
+ <PostBuildEvent>
+ <Command>copy "$(TargetPath)" ..\..\..\lib\$(TargetName).dll
+copy "$(TargetDir)$(TargetName).lib" ..\..\..\lib\$(TargetName).lib</Command>
+ <Message>Copying target to lib/</Message>
+ </PostBuildEvent>
+ <Midl>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <TypeLibraryName>.\Release\TestRunner.tlb</TypeLibraryName>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <RedirectOutputAndErrors>NUL</RedirectOutputAndErrors>
+ </Midl>
+ <ResourceCompile>
+ <Culture>0x0409</Culture>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\Release\TestRunner.bsc</OutputFile>
+ </Bscmake>
+ <Link>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <LinkDLL>true</LinkDLL>
+ <SubSystem>Windows</SubSystem>
+ <ModuleDefinitionFile>.\TestRunner.def</ModuleDefinitionFile>
+ <OutputFile>.\Release\TestRunner.dll</OutputFile>
+ <ImportLibrary>.\Release\TestRunner.lib</ImportLibrary>
+ <AdditionalDependencies>..\..\..\lib\cppunit.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
<ItemGroup>
<CustomBuild Include="res\errortype.bmp" />
<CustomBuild Include="res\test_type.bmp" />
< at >< at > -301,46 +574,70 < at >< at > copy "$(TargetDir)$(TargetName).lib" ..\..\..\lib\$(TargetName).lib</Command>
... etc. - the rest is truncated
</pre>
Libreoffice Gerrit user
2013-05-25T21:25:04
-
.: NEWS
http://comments.gmane.org/gmane.comp.documentfoundation.libreoffice.scm/27752
<pre> NEWS | 9 +++++++++
1 file changed, 9 insertions(+)
New commits:
commit 9953a5621b9feef624f97df7e45e88af0ff38184
Author: Markus Mohrhard <markus.mohrhard< at >googlemail.com>
Date: Sat May 25 23:06:16 2013 +0200
update NEWS file with 1.13.2 changes
diff --git a/NEWS b/NEWS
index 4712771..efbf5d2 100644
--- a/NEWS
+++ b/NEWS
< at >< at > -1,3 +1,12 < at >< at >
+ New in CppUnit 1.13.2:
+ ---------------------
+
+* Portability:
+ - Supports 64 bit build on windows
+
+ - Report errors from dlopen and dlclose on windows through dlerror on
+ unix.
+
New in CppUnit 1.13.0:
----------------------
</pre>
Libreoffice Gerrit user
2013-05-25T21:09:43
-
core.git: Branch 'libreoffice-4-1' -l10ntools/source
http://comments.gmane.org/gmane.comp.documentfoundation.libreoffice.scm/27751
<pre> l10ntools/source/export.cxx | 2 +-
l10ntools/source/helper.cxx | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 4e41e4aaa39e78102e989146c24154a85a08a59b
Author: Zolnai Tamás <zolnaitamas2000< at >gmail.com>
Date: Sat May 25 22:23:57 2013 +0200
Fix some escaping bug in l10ntools
1. A typo in export.cxx makes not working replacing
2. EscapeAll() ignored single backlash characters
Change-Id: I1a5309778acdd601391f643ebf3c66d04a6601d4
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index 5d285ad..c15d81f 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
< at >< at > -1201,7 +1201,7 < at >< at > void Export::ConvertMergeContent( OString &rText )
sal_Bool bNoClose = !rText.endsWith("\\\"");
- rText = rText.replaceAll("\\\"'","\'"); // Temporary: until PO files contain escaped single quotes
+ rText = rText.replaceAll("\\\'","\'"); // Temporary: until PO files contain escaped single quotes
// (Maybe next PO update solve this)
rText =
helper::escapeAll(
diff --git a/l10ntools/source/helper.cxx b/l10ntools/source/helper.cxx
index 6c3a0455..85bfe4a 100644
--- a/l10ntools/source/helper.cxx
+++ b/l10ntools/source/helper.cxx
< at >< at > -46,6 +46,10 < at >< at > OString unEscapeAll(
sReturn.append(rUnEscaped[nEscapedOne/2]);
++nIndex;
}
+ else
+ {
+ sReturn.append(rText[nIndex]);
+ }
}
else
sReturn.append(rText[nIndex]);
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits< at >lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
</pre>
Zolnai Tamás
2013-05-25T21:03:36
-
.: src/cppunit
http://comments.gmane.org/gmane.comp.documentfoundation.libreoffice.scm/27750
<pre> src/cppunit/UnixDynamicLibraryManager.cpp | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 13244fdaa4ff563bdb0e853b8e081fe4ebb4001f
Author: Markus Mohrhard <markus.mohrhard< at >googlemail.com>
Date: Sat May 25 22:49:09 2013 +0200
report dlerror messages on unix
Upstream Libreoffice patch.
diff --git a/src/cppunit/UnixDynamicLibraryManager.cpp b/src/cppunit/UnixDynamicLibraryManager.cpp
index f235cce..4de32cf 100644
--- a/src/cppunit/UnixDynamicLibraryManager.cpp
+++ b/src/cppunit/UnixDynamicLibraryManager.cpp
< at >< at > -34,7 +34,11 < at >< at > DynamicLibraryManager::doFindSymbol( const std::string &symbol )
std::string
DynamicLibraryManager::getLastErrorDetail() const
{
- return "";
+ const char* last_error = ::dlerror();
+ if(last_error)
+ return last_error;
+ else
+ return "";
}
</pre>
Libreoffice Gerrit user
2013-05-25T20:53:15
-
.: 2 commits - src/cppunitsrc/CppUnitLibraries2010.sln src/DllPlugInTester src/msvc6
http://comments.gmane.org/gmane.comp.documentfoundation.libreoffice.scm/27749
<pre> src/CppUnitLibraries2010.sln | 66 ++
src/DllPlugInTester/DllPlugInTester.vcxproj | 371 +++++++++++++++
src/cppunit/cppunit.vcxproj | 105 ++++
src/cppunit/cppunit_dll.vcxproj | 129 +++++
src/msvc6/testpluginrunner/TestPlugInRunner.vcxproj | 159 ++++++
src/msvc6/testrunner/DynamicWindow/cdxCDynamicDialog.cpp | 2
src/msvc6/testrunner/DynamicWindow/cdxCDynamicDialog.h | 2
src/msvc6/testrunner/DynamicWindow/cdxCDynamicWnd.cpp | 2
src/msvc6/testrunner/DynamicWindow/cdxCDynamicWnd.h | 4
src/msvc6/testrunner/TestRunner.vcxproj | 313 ++++++++++++
10 files changed, 1148 insertions(+), 5 deletions(-)
New commits:
commit d0567fcfa1e348e1bc6d91a95caa44075465bbf8
Author: Markus Mohrhard <markus.mohrhard< at >googlemail.com>
Date: Sat May 25 19:16:59 2013 +0200
add configuration for 64bit windows builds
diff --git a/src/CppUnitLibraries2010.sln b/src/CppUnitLibraries2010.sln
index 03c58f9..633f721 100644
--- a/src/CppUnitLibraries2010.sln
+++ b/src/CppUnitLibraries2010.sln
< at >< at > -25,73 +25,139 < at >< at > EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug Static|Win32 = Debug Static|Win32
+Debug Static|x64 = Debug Static|x64
Debug Unicode|Win32 = Debug Unicode|Win32
+Debug Unicode|x64 = Debug Unicode|x64
Debug|Win32 = Debug|Win32
+Debug|x64 = Debug|x64
Release Static|Win32 = Release Static|Win32
+Release Static|x64 = Release Static|x64
Release Unicode|Win32 = Release Unicode|Win32
+Release Unicode|x64 = Release Unicode|x64
Release|Win32 = Release|Win32
+Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{26047E59-ECD5-9E22-A3E3-D624038A5572}.Debug Static|Win32.ActiveCfg = Debug Static|Win32
{26047E59-ECD5-9E22-A3E3-D624038A5572}.Debug Static|Win32.Build.0 = Debug Static|Win32
+{26047E59-ECD5-9E22-A3E3-D624038A5572}.Debug Static|x64.ActiveCfg = Debug Static|x64
+{26047E59-ECD5-9E22-A3E3-D624038A5572}.Debug Static|x64.Build.0 = Debug Static|x64
{26047E59-ECD5-9E22-A3E3-D624038A5572}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32
{26047E59-ECD5-9E22-A3E3-D624038A5572}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32
+{26047E59-ECD5-9E22-A3E3-D624038A5572}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64
+{26047E59-ECD5-9E22-A3E3-D624038A5572}.Debug Unicode|x64.Build.0 = Debug Unicode|x64
{26047E59-ECD5-9E22-A3E3-D624038A5572}.Debug|Win32.ActiveCfg = Debug|Win32
{26047E59-ECD5-9E22-A3E3-D624038A5572}.Debug|Win32.Build.0 = Debug|Win32
+{26047E59-ECD5-9E22-A3E3-D624038A5572}.Debug|x64.ActiveCfg = Debug|x64
+{26047E59-ECD5-9E22-A3E3-D624038A5572}.Debug|x64.Build.0 = Debug|x64
{26047E59-ECD5-9E22-A3E3-D624038A5572}.Release Static|Win32.ActiveCfg = Release Static|Win32
{26047E59-ECD5-9E22-A3E3-D624038A5572}.Release Static|Win32.Build.0 = Release Static|Win32
+{26047E59-ECD5-9E22-A3E3-D624038A5572}.Release Static|x64.ActiveCfg = Release Static|x64
+{26047E59-ECD5-9E22-A3E3-D624038A5572}.Release Static|x64.Build.0 = Release Static|x64
{26047E59-ECD5-9E22-A3E3-D624038A5572}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32
{26047E59-ECD5-9E22-A3E3-D624038A5572}.Release Unicode|Win32.Build.0 = Release Unicode|Win32
+{26047E59-ECD5-9E22-A3E3-D624038A5572}.Release Unicode|x64.ActiveCfg = Release Unicode|x64
+{26047E59-ECD5-9E22-A3E3-D624038A5572}.Release Unicode|x64.Build.0 = Release Unicode|x64
{26047E59-ECD5-9E22-A3E3-D624038A5572}.Release|Win32.ActiveCfg = Release|Win32
{26047E59-ECD5-9E22-A3E3-D624038A5572}.Release|Win32.Build.0 = Release|Win32
+{26047E59-ECD5-9E22-A3E3-D624038A5572}.Release|x64.ActiveCfg = Release|x64
+{26047E59-ECD5-9E22-A3E3-D624038A5572}.Release|x64.Build.0 = Release|x64
{8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Debug Static|Win32.ActiveCfg = Debug|Win32
{8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Debug Static|Win32.Build.0 = Debug|Win32
+{8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Debug Static|x64.ActiveCfg = Debug|x64
+{8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Debug Static|x64.Build.0 = Debug|x64
{8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Debug Unicode|Win32.Build.0 = Debug|Win32
+{8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Debug Unicode|x64.ActiveCfg = Debug|x64
+{8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Debug Unicode|x64.Build.0 = Debug|x64
{8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Debug|Win32.ActiveCfg = Debug|Win32
{8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Debug|Win32.Build.0 = Debug|Win32
+{8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Debug|x64.ActiveCfg = Debug|x64
+{8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Debug|x64.Build.0 = Debug|x64
{8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Release Static|Win32.ActiveCfg = Release|Win32
{8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Release Static|Win32.Build.0 = Release|Win32
+{8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Release Static|x64.ActiveCfg = Release|x64
+{8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Release Static|x64.Build.0 = Release|x64
{8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Release Unicode|Win32.ActiveCfg = Release|Win32
{8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Release Unicode|Win32.Build.0 = Release|Win32
+{8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Release Unicode|x64.ActiveCfg = Release|x64
+{8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Release Unicode|x64.Build.0 = Release|x64
{8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Release|Win32.ActiveCfg = Release|Win32
{8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Release|Win32.Build.0 = Release|Win32
+{8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Release|x64.ActiveCfg = Release|x64
+{8FEDF6A8-2D35-C692-2CC3-B71090935E66}.Release|x64.Build.0 = Release|x64
{71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Debug Static|Win32.ActiveCfg = Debug Unicode|Win32
{71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Debug Static|Win32.Build.0 = Debug Unicode|Win32
+{71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Debug Static|x64.ActiveCfg = Debug Unicode|x64
+{71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Debug Static|x64.Build.0 = Debug Unicode|x64
{71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32
{71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32
+{71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64
+{71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Debug Unicode|x64.Build.0 = Debug Unicode|x64
{71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Debug|Win32.ActiveCfg = Debug|Win32
{71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Debug|Win32.Build.0 = Debug|Win32
+{71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Debug|x64.ActiveCfg = Debug|x64
+{71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Debug|x64.Build.0 = Debug|x64
{71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Release Static|Win32.ActiveCfg = Release Unicode|Win32
{71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Release Static|Win32.Build.0 = Release Unicode|Win32
+{71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Release Static|x64.ActiveCfg = Release Unicode|x64
+{71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Release Static|x64.Build.0 = Release Unicode|x64
{71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32
{71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Release Unicode|Win32.Build.0 = Release Unicode|Win32
+{71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Release Unicode|x64.ActiveCfg = Release Unicode|x64
+{71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Release Unicode|x64.Build.0 = Release Unicode|x64
{71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Release|Win32.ActiveCfg = Release|Win32
{71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Release|Win32.Build.0 = Release|Win32
+{71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Release|x64.ActiveCfg = Release|x64
+{71E8BC4A-C01E-61B8-6C5B-682FD03A6DCB}.Release|x64.Build.0 = Release|x64
{338B9353-C5CC-FCA6-A584-73425CEDD569}.Debug Static|Win32.ActiveCfg = Debug|Win32
{338B9353-C5CC-FCA6-A584-73425CEDD569}.Debug Static|Win32.Build.0 = Debug|Win32
+{338B9353-C5CC-FCA6-A584-73425CEDD569}.Debug Static|x64.ActiveCfg = Debug|x64
+{338B9353-C5CC-FCA6-A584-73425CEDD569}.Debug Static|x64.Build.0 = Debug|x64
{338B9353-C5CC-FCA6-A584-73425CEDD569}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{338B9353-C5CC-FCA6-A584-73425CEDD569}.Debug Unicode|Win32.Build.0 = Debug|Win32
+{338B9353-C5CC-FCA6-A584-73425CEDD569}.Debug Unicode|x64.ActiveCfg = Debug|x64
+{338B9353-C5CC-FCA6-A584-73425CEDD569}.Debug Unicode|x64.Build.0 = Debug|x64
{338B9353-C5CC-FCA6-A584-73425CEDD569}.Debug|Win32.ActiveCfg = Debug|Win32
{338B9353-C5CC-FCA6-A584-73425CEDD569}.Debug|Win32.Build.0 = Debug|Win32
+{338B9353-C5CC-FCA6-A584-73425CEDD569}.Debug|x64.ActiveCfg = Debug|x64
+{338B9353-C5CC-FCA6-A584-73425CEDD569}.Debug|x64.Build.0 = Debug|x64
{338B9353-C5CC-FCA6-A584-73425CEDD569}.Release Static|Win32.ActiveCfg = Release|Win32
{338B9353-C5CC-FCA6-A584-73425CEDD569}.Release Static|Win32.Build.0 = Release|Win32
+{338B9353-C5CC-FCA6-A584-73425CEDD569}.Release Static|x64.ActiveCfg = Release|x64
+{338B9353-C5CC-FCA6-A584-73425CEDD569}.Release Static|x64.Build.0 = Release|x64
{338B9353-C5CC-FCA6-A584-73425CEDD569}.Release Unicode|Win32.ActiveCfg = Release|Win32
{338B9353-C5CC-FCA6-A584-73425CEDD569}.Release Unicode|Win32.Build.0 = Release|Win32
+{338B9353-C5CC-FCA6-A584-73425CEDD569}.Release Unicode|x64.ActiveCfg = Release|x64
+{338B9353-C5CC-FCA6-A584-73425CEDD569}.Release Unicode|x64.Build.0 = Release|x64
{338B9353-C5CC-FCA6-A584-73425CEDD569}.Release|Win32.ActiveCfg = Release|Win32
{338B9353-C5CC-FCA6-A584-73425CEDD569}.Release|Win32.Build.0 = Release|Win32
+{338B9353-C5CC-FCA6-A584-73425CEDD569}.Release|x64.ActiveCfg = Release|x64
+{338B9353-C5CC-FCA6-A584-73425CEDD569}.Release|x64.Build.0 = Release|x64
{EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Debug Static|Win32.ActiveCfg = Debug|Win32
{EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Debug Static|Win32.Build.0 = Debug|Win32
+{EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Debug Static|x64.ActiveCfg = Debug|x64
+{EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Debug Static|x64.Build.0 = Debug|x64
{EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Debug Unicode|Win32.Build.0 = Debug|Win32
+{EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Debug Unicode|x64.ActiveCfg = Debug|x64
+{EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Debug Unicode|x64.Build.0 = Debug|x64
{EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Debug|Win32.ActiveCfg = Debug|Win32
{EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Debug|Win32.Build.0 = Debug|Win32
+{EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Debug|x64.ActiveCfg = Debug|x64
+{EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Debug|x64.Build.0 = Debug|x64
{EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Release Static|Win32.ActiveCfg = Release|Win32
{EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Release Static|Win32.Build.0 = Release|Win32
+{EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Release Static|x64.ActiveCfg = Release|x64
+{EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Release Static|x64.Build.0 = Release|x64
{EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Release Unicode|Win32.ActiveCfg = Release|Win32
{EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Release Unicode|Win32.Build.0 = Release|Win32
+{EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Release Unicode|x64.ActiveCfg = Release|x64
+{EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Release Unicode|x64.Build.0 = Release|x64
{EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Release|Win32.ActiveCfg = Release|Win32
{EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Release|Win32.Build.0 = Release|Win32
+{EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Release|x64.ActiveCfg = Release|x64
+{EB329AF7-E267-3B00-09A4-FF1F909E4FB5}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/src/DllPlugInTester/DllPlugInTester.vcxproj b/src/DllPlugInTester/DllPlugInTester.vcxproj
index 6a48731..6af947d 100644
--- a/src/DllPlugInTester/DllPlugInTester.vcxproj
+++ b/src/DllPlugInTester/DllPlugInTester.vcxproj
< at >< at > -5,26 +5,50 < at >< at >
<Configuration>Debug Static</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Debug Static|x64">
+ <Configuration>Debug Static</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Debug Unicode|Win32">
<Configuration>Debug Unicode</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Debug Unicode|x64">
+ <Configuration>Debug Unicode</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Release Static|Win32">
<Configuration>Release Static</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Release Static|x64">
+ <Configuration>Release Static</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Release Unicode|Win32">
<Configuration>Release Unicode</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Release Unicode|x64">
+ <Configuration>Release Unicode</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<SccProjectName />
< at >< at > -37,31 +61,61 < at >< at >
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Static|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Static|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
< at >< at > -69,26 +123,50 < at >< at >
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
+ </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
+ </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
+ </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Static|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Static|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
+ </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
+ </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
+ </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">
<OutDir>.\ReleaseUnicode\</OutDir>
< at >< at > -96,35 +174,70 < at >< at >
<LinkIncremental>false</LinkIncremental>
<TargetName>$(ProjectName)u</TargetName>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">
+ <OutDir>.\ReleaseUnicode\</OutDir>
+ <IntDir>.\ReleaseUnicode\</IntDir>
+ <LinkIncremental>false</LinkIncremental>
+ <TargetName>$(ProjectName)u</TargetName>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static|Win32'">
<OutDir>.\Debug\</OutDir>
<IntDir>.\Debug\</IntDir>
<LinkIncremental>false</LinkIncremental>
<TargetName>$(ProjectName)d</TargetName>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static|x64'">
+ <OutDir>.\Debug\</OutDir>
+ <IntDir>.\Debug\</IntDir>
+ <LinkIncremental>false</LinkIncremental>
+ <TargetName>$(ProjectName)d</TargetName>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Static|Win32'">
<OutDir>.\Release\</OutDir>
<IntDir>.\Release\</IntDir>
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Static|x64'">
+ <OutDir>.\Release\</OutDir>
+ <IntDir>.\Release\</IntDir>
+ <LinkIncremental>false</LinkIncremental>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>.\DebugDll\</OutDir>
<IntDir>.\DebugDll\</IntDir>
<LinkIncremental>false</LinkIncremental>
<TargetName>DllPlugInTesterd_dll</TargetName>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <OutDir>.\DebugDll\</OutDir>
+ <IntDir>.\DebugDll\</IntDir>
+ <LinkIncremental>false</LinkIncremental>
+ <TargetName>DllPlugInTesterd_dll</TargetName>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>.\ReleaseDll\</OutDir>
<IntDir>.\ReleaseDll\</IntDir>
<LinkIncremental>false</LinkIncremental>
<TargetName>$(ProjectName)_dll</TargetName>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <OutDir>.\ReleaseDll\</OutDir>
+ <IntDir>.\ReleaseDll\</IntDir>
+ <LinkIncremental>false</LinkIncremental>
+ <TargetName>$(ProjectName)_dll</TargetName>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">
<OutDir>.\DebugUnicode\</OutDir>
<IntDir>.\DebugUnicode\</IntDir>
<LinkIncremental>false</LinkIncremental>
<TargetName>$(ProjectName)ud</TargetName>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">
+ <OutDir>.\DebugUnicode\</OutDir>
+ <IntDir>.\DebugUnicode\</IntDir>
+ <LinkIncremental>false</LinkIncremental>
+ <TargetName>$(ProjectName)ud</TargetName>
+ </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">
<ClCompile>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
< at >< at > -168,6 +281,49 < at >< at >
<AdditionalDependencies>odbc32.lib;odbccp32.lib;cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">
+ <ClCompile>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <StringPooling>true</StringPooling>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <Optimization>MinSpace</Optimization>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <WarningLevel>Level3</WarningLevel>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
+ <DebugInformationFormat>OldStyle</DebugInformationFormat>
+ <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AssemblerListingLocation>.\ReleaseUnicode\</AssemblerListingLocation>
+ <PrecompiledHeaderOutputFile>.\ReleaseUnicode\DllPlugInTester.pch</PrecompiledHeaderOutputFile>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <ObjectFileName>.\ReleaseUnicode\</ObjectFileName>
+ <ProgramDataBaseFileName>.\ReleaseUnicode\</ProgramDataBaseFileName>
+ </ClCompile>
+ <PostBuildEvent>
+ <Command>copy "$(TargetPath)" ..\..\lib\$(TargetName).exe</Command>
+ <Message>Copying target to lib/</Message>
+ </PostBuildEvent>
+ <Midl>
+ <TypeLibraryName>.\ReleaseUnicode\DllPlugInTester.tlb</TypeLibraryName>
+ </Midl>
+ <ResourceCompile>
+ <Culture>0x040c</Culture>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\ReleaseUnicode\DllPlugInTester.bsc</OutputFile>
+ </Bscmake>
+ <Link>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <SubSystem>Console</SubSystem>
+ <OutputFile>ReleaseUnicode\DllPlugInTesteru.exe</OutputFile>
+ <AdditionalLibraryDirectories>../../lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>odbc32.lib;odbccp32.lib;cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static|Win32'">
<ClCompile>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
< at >< at > -212,6 +368,49 < at >< at >
<AdditionalDependencies>odbc32.lib;odbccp32.lib;cppunitd.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static|x64'">
+ <ClCompile>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+ <FunctionLevelLinking>false</FunctionLevelLinking>
+ <Optimization>Disabled</Optimization>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <WarningLevel>Level3</WarningLevel>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
+ <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AssemblerListingLocation>.\Debug\</AssemblerListingLocation>
+ <PrecompiledHeaderOutputFile>.\Debug\DllPlugInTester.pch</PrecompiledHeaderOutputFile>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <ObjectFileName>.\Debug\</ObjectFileName>
+ <ProgramDataBaseFileName>.\Debug\</ProgramDataBaseFileName>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ </ClCompile>
+ <PostBuildEvent>
+ <Command>copy $(TargetPath) ..\..\lib\$(TargetName).exe</Command>
+ <Message>Copying target to lib/</Message>
+ </PostBuildEvent>
+ <Midl>
+ <TypeLibraryName>.\Debug\DllPlugInTester.tlb</TypeLibraryName>
+ </Midl>
+ <ResourceCompile>
+ <Culture>0x040c</Culture>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\Debug\DllPlugInTester.bsc</OutputFile>
+ </Bscmake>
+ <Link>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Console</SubSystem>
+ <OutputFile>Debug\DllPlugInTesterd.exe</OutputFile>
+ <AdditionalLibraryDirectories>../../lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>odbc32.lib;odbccp32.lib;cppunitd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Static|Win32'">
<ClCompile>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
< at >< at > -255,6 +454,49 < at >< at >
<AdditionalDependencies>odbc32.lib;odbccp32.lib;cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Static|x64'">
+ <ClCompile>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <StringPooling>true</StringPooling>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <Optimization>MinSpace</Optimization>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <WarningLevel>Level3</WarningLevel>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
+ <DebugInformationFormat>OldStyle</DebugInformationFormat>
+ <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AssemblerListingLocation>.\Release\</AssemblerListingLocation>
+ <PrecompiledHeaderOutputFile>.\Release\DllPlugInTester.pch</PrecompiledHeaderOutputFile>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <ObjectFileName>.\Release\</ObjectFileName>
+ <ProgramDataBaseFileName>.\Release\</ProgramDataBaseFileName>
+ </ClCompile>
+ <PostBuildEvent>
+ <Command>copy $(TargetPath) ..\..\lib\$(TargetName).exe</Command>
+ <Message>Copying target to lib/</Message>
+ </PostBuildEvent>
+ <Midl>
+ <TypeLibraryName>.\Release\DllPlugInTester.tlb</TypeLibraryName>
+ </Midl>
+ <ResourceCompile>
+ <Culture>0x040c</Culture>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\Release\DllPlugInTester.bsc</OutputFile>
+ </Bscmake>
+ <Link>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <SubSystem>Console</SubSystem>
+ <OutputFile>.\Release\DllPlugInTester.exe</OutputFile>
+ <AdditionalLibraryDirectories>../../lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>odbc32.lib;odbccp32.lib;cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
< at >< at > -299,6 +541,49 < at >< at >
<AdditionalDependencies>odbc32.lib;odbccp32.lib;cppunitd_dll.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+ <FunctionLevelLinking>false</FunctionLevelLinking>
+ <Optimization>Disabled</Optimization>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <WarningLevel>Level3</WarningLevel>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
+ <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;CPPUNIT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AssemblerListingLocation>.\DebugDll\</AssemblerListingLocation>
+ <PrecompiledHeaderOutputFile>.\DebugDll\DllPlugInTester.pch</PrecompiledHeaderOutputFile>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <ObjectFileName>.\DebugDll\</ObjectFileName>
+ <ProgramDataBaseFileName>.\DebugDll\</ProgramDataBaseFileName>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ </ClCompile>
+ <PostBuildEvent>
+ <Command>copy "$(TargetPath)" ..\..\lib\$(TargetName).exe</Command>
+ <Message>Copying target to lib/</Message>
+ </PostBuildEvent>
+ <Midl>
+ <TypeLibraryName>.\DebugDll\DllPlugInTester.tlb</TypeLibraryName>
+ </Midl>
+ <ResourceCompile>
+ <Culture>0x040c</Culture>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\DebugDll\DllPlugInTester.bsc</OutputFile>
+ </Bscmake>
+ <Link>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Console</SubSystem>
+ <OutputFile>DebugDll\DllPlugInTesterd_dll.exe</OutputFile>
+ <AdditionalLibraryDirectories>../../lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>odbc32.lib;odbccp32.lib;cppunitd_dll.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
< at >< at > -342,6 +627,49 < at >< at >
<AdditionalDependencies>odbc32.lib;odbccp32.lib;cppunit_dll.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <StringPooling>true</StringPooling>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <Optimization>MinSpace</Optimization>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <WarningLevel>Level3</WarningLevel>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
+ <DebugInformationFormat>OldStyle</DebugInformationFormat>
+ <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;CPPUNIT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AssemblerListingLocation>.\ReleaseDll\</AssemblerListingLocation>
+ <PrecompiledHeaderOutputFile>.\ReleaseDll\DllPlugInTester.pch</PrecompiledHeaderOutputFile>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <ObjectFileName>.\ReleaseDll\</ObjectFileName>
+ <ProgramDataBaseFileName>.\ReleaseDll\</ProgramDataBaseFileName>
+ </ClCompile>
+ <PostBuildEvent>
+ <Command>copy "$(TargetPath)" ..\..\lib\$(TargetName).exe</Command>
+ <Message>Copying target to lib/</Message>
+ </PostBuildEvent>
+ <Midl>
+ <TypeLibraryName>.\ReleaseDll\DllPlugInTester.tlb</TypeLibraryName>
+ </Midl>
+ <ResourceCompile>
+ <Culture>0x040c</Culture>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\ReleaseDll\DllPlugInTester.bsc</OutputFile>
+ </Bscmake>
+ <Link>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <SubSystem>Console</SubSystem>
+ <OutputFile>ReleaseDll\DllPlugInTester_dll.exe</OutputFile>
+ <AdditionalLibraryDirectories>../../lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>odbc32.lib;odbccp32.lib;cppunit_dll.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">
<ClCompile>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
< at >< at > -386,6 +714,49 < at >< at >
<AdditionalDependencies>odbc32.lib;odbccp32.lib;cppunitd.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">
+ <ClCompile>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+ <FunctionLevelLinking>false</FunctionLevelLinking>
+ <Optimization>Disabled</Optimization>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <WarningLevel>Level3</WarningLevel>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
+ <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AssemblerListingLocation>.\DebugUnicode\</AssemblerListingLocation>
+ <PrecompiledHeaderOutputFile>.\DebugUnicode\DllPlugInTester.pch</PrecompiledHeaderOutputFile>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <ObjectFileName>.\DebugUnicode\</ObjectFileName>
+ <ProgramDataBaseFileName>.\DebugUnicode\</ProgramDataBaseFileName>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ </ClCompile>
+ <PostBuildEvent>
+ <Command>copy "$(TargetPath)" ..\..\lib\$(TargetName).exe</Command>
+ <Message>Copying target to lib/</Message>
+ </PostBuildEvent>
+ <Midl>
+ <TypeLibraryName>.\DebugUnicode\DllPlugInTester.tlb</TypeLibraryName>
+ </Midl>
+ <ResourceCompile>
+ <Culture>0x040c</Culture>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\DebugUnicode\DllPlugInTester.bsc</OutputFile>
+ </Bscmake>
+ <Link>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Console</SubSystem>
+ <OutputFile>DebugUnicode\DllPlugInTesterud.exe</OutputFile>
+ <AdditionalLibraryDirectories>../../lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>odbc32.lib;odbccp32.lib;cppunitd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="CommandLineParser.cpp" />
<ClCompile Include="DllPlugInTester.cpp" />
diff --git a/src/cppunit/cppunit.vcxproj b/src/cppunit/cppunit.vcxproj
index e0a1420..0367d20 100644
--- a/src/cppunit/cppunit.vcxproj
+++ b/src/cppunit/cppunit.vcxproj
< at >< at > -5,10 +5,18 < at >< at >
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<SccProjectName />
< at >< at > -21,11 +29,21 < at >< at >
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
< at >< at > -33,20 +51,37 < at >< at >
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
+ </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
+ </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>.\Release\</OutDir>
<IntDir>.\Release\</IntDir>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <OutDir>.\Release\</OutDir>
+ <IntDir>.\Release\</IntDir>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>.\Debug\</OutDir>
<IntDir>.\Debug\</IntDir>
<TargetName>$(ProjectName)d</TargetName>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <OutDir>.\Debug\</OutDir>
+ <IntDir>.\Debug\</IntDir>
+ <TargetName>$(ProjectName)d</TargetName>
+ </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
< at >< at > -82,6 +117,41 < at >< at >
<OutputFile>.\Release\cppunit.lib</OutputFile>
</Lib>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <StringPooling>true</StringPooling>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <Optimization>MaxSpeed</Optimization>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <WarningLevel>Level3</WarningLevel>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
+ <DebugInformationFormat>OldStyle</DebugInformationFormat>
+ <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>NDEBUG;_LIB;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AssemblerListingLocation>.\Release\</AssemblerListingLocation>
+ <PrecompiledHeaderOutputFile>.\Release\cppunit.pch</PrecompiledHeaderOutputFile>
+ <ObjectFileName>.\Release\</ObjectFileName>
+ <ProgramDataBaseFileName>.\Release\</ProgramDataBaseFileName>
+ </ClCompile>
+ <PostBuildEvent>
+ <Command>copy "$(TargetPath)" ..\..\lib\$(TargetName).lib</Command>
+ <Message>Copying target to lib/</Message>
+ </PostBuildEvent>
+ <ResourceCompile>
+ <Culture>0x040c</Culture>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\Release\cppunit.bsc</OutputFile>
+ </Bscmake>
+ <Lib>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\Release\cppunit.lib</OutputFile>
+ </Lib>
+ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
< at >< at > -117,6 +187,40 < at >< at >
<OutputFile>Debug\$(TargetName).lib</OutputFile>
</Lib>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+ <FunctionLevelLinking>false</FunctionLevelLinking>
+ <Optimization>Disabled</Optimization>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <WarningLevel>Level3</WarningLevel>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
+ <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_DEBUG;_LIB;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AssemblerListingLocation>.\Debug\</AssemblerListingLocation>
+ <PrecompiledHeaderOutputFile>.\Debug\cppunit.pch</PrecompiledHeaderOutputFile>
+ <ObjectFileName>.\Debug\</ObjectFileName>
+ <ProgramDataBaseFileName>.\Debug\</ProgramDataBaseFileName>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ </ClCompile>
+ <PostBuildEvent>
+ <Command>copy "$(TargetPath)" ..\..\lib\$(TargetName).lib</Command>
+ <Message>Copying target to lib/</Message>
+ </PostBuildEvent>
+ <ResourceCompile>
+ <Culture>0x040c</Culture>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\Debug\cppunit.bsc</OutputFile>
+ </Bscmake>
+ <Lib>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>Debug\$(TargetName).lib</OutputFile>
+ </Lib>
+ </ItemDefinitionGroup>
<ItemGroup>
<CustomBuild Include="..\..\ChangeLog">
<FileType>Document</FileType>
< at >< at > -168,6 +272,7 < at >< at >
<ClCompile Include="TextOutputter.cpp" />
<ClCompile Include="XmlOutputter.cpp">
<WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level3</WarningLevel>
+ <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level3</WarningLevel>
</ClCompile>
<ClCompile Include="XmlOutputterHook.cpp" />
<ClCompile Include="AdditionalMessage.cpp" />
diff --git a/src/cppunit/cppunit_dll.vcxproj b/src/cppunit/cppunit_dll.vcxproj
index 2101923..292e62f 100644
--- a/src/cppunit/cppunit_dll.vcxproj
+++ b/src/cppunit/cppunit_dll.vcxproj
< at >< at > -5,10 +5,18 < at >< at >
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<SccProjectName />
< at >< at > -21,11 +29,21 < at >< at >
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
< at >< at > -33,10 +51,18 < at >< at >
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
+ </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
+ </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>.\DebugDll\</OutDir>
< at >< at > -44,11 +70,22 < at >< at >
<LinkIncremental>true</LinkIncremental>
<TargetName>cppunitd_dll</TargetName>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <OutDir>.\DebugDll\</OutDir>
+ <IntDir>.\DebugDll\</IntDir>
+ <LinkIncremental>true</LinkIncremental>
+ <TargetName>cppunitd_dll</TargetName>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>.\ReleaseDll\</OutDir>
<IntDir>.\ReleaseDll\</IntDir>
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <OutDir>.\ReleaseDll\</OutDir>
+ <IntDir>.\ReleaseDll\</IntDir>
+ <LinkIncremental>false</LinkIncremental>
+ </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
< at >< at > -97,6 +134,52 < at >< at > copy "$(TargetDir)$(TargetName).lib" ..\..\lib\$(TargetName).lib</Command>
<AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+ <FunctionLevelLinking>false</FunctionLevelLinking>
+ <Optimization>Disabled</Optimization>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <WarningLevel>Level3</WarningLevel>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
+ <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;CPPUNIT_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AssemblerListingLocation>.\DebugDll\</AssemblerListingLocation>
+ <PrecompiledHeaderOutputFile>.\DebugDll\cppunit_dll.pch</PrecompiledHeaderOutputFile>
+ <ObjectFileName>.\DebugDll\</ObjectFileName>
+ <ProgramDataBaseFileName>.\DebugDll\</ProgramDataBaseFileName>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ </ClCompile>
+ <PostBuildEvent>
+ <Command>copy "$(TargetPath)" ..\..\lib\$(TargetName).dll
+copy "$(TargetDir)$(TargetName).lib" ..\..\lib\$(TargetName).lib</Command>
+ <Message>Copying target to lib/</Message>
+ </PostBuildEvent>
+ <Midl>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <TypeLibraryName>.\DebugDll\cppunit_dll.tlb</TypeLibraryName>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ </Midl>
+ <ResourceCompile>
+ <Culture>0x040c</Culture>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\DebugDll\cppunit_dll.bsc</OutputFile>
+ </Bscmake>
+ <Link>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <LinkDLL>true</LinkDLL>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Console</SubSystem>
+ <OutputFile>DebugDll\cppunitd_dll.dll</OutputFile>
+ <ImportLibrary>.\DebugDll\cppunitd_dll.lib</ImportLibrary>
+ <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
< at >< at > -144,6 +227,52 < at >< at > copy "$(TargetDir)$(TargetName).lib" ..\..\lib\$(TargetName).lib</Command>
<AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <StringPooling>true</StringPooling>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <Optimization>MaxSpeed</Optimization>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <WarningLevel>Level3</WarningLevel>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
+ <DebugInformationFormat>OldStyle</DebugInformationFormat>
+ <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CPPUNIT_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AssemblerListingLocation>.\ReleaseDll\</AssemblerListingLocation>
+ <PrecompiledHeaderOutputFile>.\ReleaseDll\cppunit_dll.pch</PrecompiledHeaderOutputFile>
+ <ObjectFileName>.\ReleaseDll\</ObjectFileName>
+ <ProgramDataBaseFileName>.\ReleaseDll\</ProgramDataBaseFileName>
+ </ClCompile>
+ <PostBuildEvent>
+ <Command>copy "$(TargetPath)" ..\..\lib\$(TargetName).dll
+copy "$(TargetDir)$(TargetName).lib" ..\..\lib\$(TargetName).lib</Command>
+ <Message>Copying target to lib/</Message>
+ </PostBuildEvent>
+ <Midl>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <TypeLibraryName>.\ReleaseDll\cppunit_dll.tlb</TypeLibraryName>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ </Midl>
+ <ResourceCompile>
+ <Culture>0x040c</Culture>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\ReleaseDll\cppunit_dll.bsc</OutputFile>
+ </Bscmake>
+ <Link>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <LinkDLL>true</LinkDLL>
+ <SubSystem>Console</SubSystem>
+ <OutputFile>.\ReleaseDll\cppunit_dll.dll</OutputFile>
+ <ImportLibrary>.\ReleaseDll\cppunit_dll.lib</ImportLibrary>
+ <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="DllMain.cpp" />
<ClCompile Include="RepeatedTest.cpp" />
diff --git a/src/msvc6/testpluginrunner/TestPlugInRunner.vcxproj b/src/msvc6/testpluginrunner/TestPlugInRunner.vcxproj
index 97955e8..91defd0 100644
--- a/src/msvc6/testpluginrunner/TestPlugInRunner.vcxproj
+++ b/src/msvc6/testpluginrunner/TestPlugInRunner.vcxproj
< at >< at > -5,10 +5,18 < at >< at >
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<SccProjectName />
< at >< at > -22,11 +30,21 < at >< at >
<UseOfMfc>Dynamic</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseOfMfc>Dynamic</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseOfMfc>Dynamic</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
< at >< at > -34,22 +52,41 < at >< at >
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
+ </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
+ </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>.\Release\</OutDir>
<IntDir>.\Release\</IntDir>
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <OutDir>.\Release\</OutDir>
+ <IntDir>.\Release\</IntDir>
+ <LinkIncremental>false</LinkIncremental>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>.\Debug\</OutDir>
<IntDir>.\Debug\</IntDir>
<LinkIncremental>false</LinkIncremental>
<TargetName>$(ProjectName)d</TargetName>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <OutDir>.\Debug\</OutDir>
+ <IntDir>.\Debug\</IntDir>
+ <LinkIncremental>false</LinkIncremental>
+ <TargetName>$(ProjectName)d</TargetName>
+ </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
< at >< at > -97,6 +134,52 < at >< at >
<AdditionalDependencies>cppunit_dll.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <StringPooling>true</StringPooling>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <Optimization>MaxSpeed</Optimization>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <WarningLevel>Level3</WarningLevel>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
+ <DebugInformationFormat>OldStyle</DebugInformationFormat>
+ <AdditionalIncludeDirectories>../../include;../TestRunner;..\..\..\include;..\..\..\include\msvc6;..\TestRunner;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;CPPUNIT_SUBCLASSING_TESTRUNNERDLG_BUILD;CPPUNIT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AssemblerListingLocation>.\Release\</AssemblerListingLocation>
+ <PrecompiledHeaderOutputFile>.\Release\TestPlugInRunner.pch</PrecompiledHeaderOutputFile>
+ <PrecompiledHeader>Use</PrecompiledHeader>
+ <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
+ <ObjectFileName>.\Release\</ObjectFileName>
+ <ProgramDataBaseFileName>.\Release\</ProgramDataBaseFileName>
+ </ClCompile>
+ <PostBuildEvent>
+ <Command>copy "$(TargetPath)" ..\..\..\lib\$(TargetName).exe</Command>
+ <Message>Copying target to lib/</Message>
+ </PostBuildEvent>
+ <Midl>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <TypeLibraryName>.\Release\TestPlugInRunner.tlb</TypeLibraryName>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ </Midl>
+ <ResourceCompile>
+ <Culture>0x040c</Culture>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\Release\TestPlugInRunner.bsc</OutputFile>
+ </Bscmake>
+ <Link>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <SubSystem>Windows</SubSystem>
+ <OutputFile>.\Release\TestPlugInRunner.exe</OutputFile>
+ <AdditionalLibraryDirectories>../../../lib/;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>cppunit_dll.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
< at >< at > -145,6 +228,52 < at >< at >
<AdditionalDependencies>cppunitd_dll.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+ <FunctionLevelLinking>false</FunctionLevelLinking>
+ <Optimization>Disabled</Optimization>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <WarningLevel>Level3</WarningLevel>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
+ <AdditionalIncludeDirectories>..\..\..\include;..\..\..\include\msvc6;..\TestRunner;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_DEBUG;CPPUNIT_TESTPLUGINRUNNER_BUILD;WIN32;_WINDOWS;CPPUNIT_SUBCLASSING_TESTRUNNERDLG_BUILD;CPPUNIT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AssemblerListingLocation>.\Debug\</AssemblerListingLocation>
+ <PrecompiledHeaderOutputFile>.\Debug\TestPlugInRunner.pch</PrecompiledHeaderOutputFile>
+ <PrecompiledHeader>Use</PrecompiledHeader>
+ <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
+ <ObjectFileName>.\Debug\</ObjectFileName>
+ <ProgramDataBaseFileName>.\Debug\</ProgramDataBaseFileName>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ </ClCompile>
+ <PostBuildEvent>
+ <Command>copy "$(TargetPath)" ..\..\..\lib\$(TargetName).exe</Command>
+ <Message>Copying target to lib/</Message>
+ </PostBuildEvent>
+ <Midl>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <TypeLibraryName>.\Debug\TestPlugInRunner.tlb</TypeLibraryName>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ </Midl>
+ <ResourceCompile>
+ <Culture>0x040c</Culture>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\Debug\TestPlugInRunner.bsc</OutputFile>
+ </Bscmake>
+ <Link>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ <OutputFile>Debug/TestPlugInRunnerd.exe</OutputFile>
+ <AdditionalLibraryDirectories>../../../lib/;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>cppunitd_dll.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
<ItemGroup>
<CustomBuild Include="res\errortype.bmp" />
<CustomBuild Include="res\ico00001.ico" />
< at >< at > -161,26 +290,38 < at >< at >
<CustomBuild Include="..\..\..\lib\cppunit_dll.dll">
<FileType>Document</FileType>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(FullPath) $(IntDir)%(Filename).dll</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy %(FullPath) $(IntDir)%(Filename).dll</Command>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Updating %(FullPath)</Message>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Updating %(FullPath)</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)\$(InputName).dll;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)\$(InputName).dll;%(Outputs)</Outputs>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</CustomBuild>
<CustomBuild Include="..\..\..\lib\cppunitd_dll.dll">
<FileType>Document</FileType>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(IntDir)%(Filename).dll</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy %(FullPath) $(IntDir)%(Filename).dll</Command>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Updating %(FullPath)</Message>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Updating %(FullPath)</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)\$(InputName).dll;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)\$(InputName).dll;%(Outputs)</Outputs>
</CustomBuild>
<CustomBuild Include="..\..\..\lib\testrunner.dll">
<FileType>Document</FileType>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</CustomBuild>
<CustomBuild Include="..\..\..\lib\testrunnerd.dll">
<FileType>Document</FileType>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</CustomBuild>
<CustomBuild Include="ReadMe.txt" />
</ItemGroup>
< at >< at > -217,9 +358,13 < at >< at >
<ItemGroup>
<ClCompile Include="StdAfx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
<PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">stdafx.h</PrecompiledHeaderFile>
+ <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">stdafx.h</PrecompiledHeaderFile>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
<PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">stdafx.h</PrecompiledHeaderFile>
+ <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">stdafx.h</PrecompiledHeaderFile>
</ClCompile>
<ClCompile Include="TestPlugInRunnerApp.cpp" />
<ClCompile Include="TestPlugInRunnerDlg.cpp" />
< at >< at > -228,27 +373,37 < at >< at >
<ClCompile Include="TestPlugInRunnerModel.cpp" />
<ClCompile Include="..\testrunner\DynamicWindow\cdxCDynamicBar.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\testrunner\DynamicWindow\cdxCDynamicControlsManager.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\testrunner\DynamicWindow\cdxCDynamicDialog.cpp" />
<ClCompile Include="..\testrunner\DynamicWindow\cdxCDynamicFormView.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\testrunner\DynamicWindow\cdxCDynamicPropSheet.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\testrunner\DynamicWindow\cdxCDynamicWnd.cpp" />
<ClCompile Include="..\testrunner\DynamicWindow\cdxCDynamicWndEx.cpp" />
<ClCompile Include="..\testrunner\DynamicWindow\cdxCSizeIconCtrl.cpp" />
<ClCompile Include="..\testrunner\DynamicWindow\SizeCBar.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\testrunner\ListCtrlFormatter.cpp" />
<ClCompile Include="..\testrunner\ListCtrlSetter.cpp" />
< at >< at > -263,8 +418,12 < at >< at >
<ClCompile Include="..\..\..\include\msvc6\DSPlugin\TestRunnerDSPluginVC6_i.c">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ </PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ </PrecompiledHeader>
</ClCompile>
</ItemGroup>
<ItemGroup>
diff --git a/src/msvc6/testrunner/TestRunner.vcxproj b/src/msvc6/testrunner/TestRunner.vcxproj
index 6875ecc..320dc85 100644
--- a/src/msvc6/testrunner/TestRunner.vcxproj
+++ b/src/msvc6/testrunner/TestRunner.vcxproj
< at >< at > -5,18 +5,34 < at >< at >
<Configuration>Debug Unicode</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Debug Unicode|x64">
+ <Configuration>Debug Unicode</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Release Unicode|Win32">
<Configuration>Release Unicode</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Release Unicode|x64">
+ <Configuration>Release Unicode</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<SccProjectName />
< at >< at > -29,20 +45,38 < at >< at >
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>Dynamic</UseOfMfc>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>Dynamic</UseOfMfc>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>Dynamic</UseOfMfc>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>Dynamic</UseOfMfc>
+ </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
< at >< at > -50,18 +84,34 < at >< at >
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
+ </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
+ </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
+ </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
+ </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>.\Debug\</OutDir>
< at >< at > -69,23 +119,46 < at >< at >
<LinkIncremental>false</LinkIncremental>
<TargetName>testrunnerd</TargetName>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <OutDir>.\Debug\</OutDir>
+ <IntDir>.\Debug\</IntDir>
+ <LinkIncremental>false</LinkIncremental>
+ <TargetName>testrunnerd</TargetName>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">
<OutDir>.\ReleaseUnicode\</OutDir>
<IntDir>.\ReleaseUnicode\</IntDir>
<LinkIncremental>false</LinkIncremental>
<TargetName>testrunneru</TargetName>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">
+ <OutDir>.\ReleaseUnicode\</OutDir>
+ <IntDir>.\ReleaseUnicode\</IntDir>
+ <LinkIncremental>false</LinkIncremental>
+ <TargetName>testrunneru</TargetName>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">
<OutDir>.\DebugUnicode\</OutDir>
<IntDir>.\DebugUnicode\</IntDir>
<LinkIncremental>false</LinkIncremental>
<TargetName>testrunnerud</TargetName>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">
+ <OutDir>.\DebugUnicode\</OutDir>
+ <IntDir>.\DebugUnicode\</IntDir>
+ <LinkIncremental>false</LinkIncremental>
+ <TargetName>testrunnerud</TargetName>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>.\Release\</OutDir>
<IntDir>.\Release\</IntDir>
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <OutDir>.\Release\</OutDir>
+ <IntDir>.\Release\</IntDir>
+ <LinkIncremental>false</LinkIncremental>
+ </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
< at >< at > -138,6 +211,56 < at >< at > copy "$(TargetDir)$(TargetName).lib" ..\..\..\lib\$(TargetName).lib</Command>
<AdditionalDependencies>..\..\..\lib\cppunitd.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+ <FunctionLevelLinking>false</FunctionLevelLinking>
+ <Optimization>Disabled</Optimization>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <WarningLevel>Level3</WarningLevel>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
+ <AdditionalIncludeDirectories>..\..\..\include;..\..\..\include\msvc6;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_DEBUG;_AFXEXT;_WINDOWS;_WINDLL;WIN32;OEMRESOURCE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AssemblerListingLocation>.\Debug\</AssemblerListingLocation>
+ <BrowseInformation>true</BrowseInformation>
+ <PrecompiledHeaderOutputFile>.\Debug\TestRunner.pch</PrecompiledHeaderOutputFile>
+ <PrecompiledHeader>Use</PrecompiledHeader>
+ <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
+ <ObjectFileName>.\Debug\</ObjectFileName>
+ <ProgramDataBaseFileName>.\Debug\</ProgramDataBaseFileName>
+ </ClCompile>
+ <PostBuildEvent>
+ <Command>copy "$(TargetPath)" ..\..\..\lib\$(TargetName).dll
+copy "$(TargetDir)$(TargetName).lib" ..\..\..\lib\$(TargetName).lib</Command>
+ <Message>Copying target to lib/</Message>
+ </PostBuildEvent>
+ <Midl>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <TypeLibraryName>.\Debug\TestRunner.tlb</TypeLibraryName>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <RedirectOutputAndErrors>NUL</RedirectOutputAndErrors>
+ </Midl>
+ <ResourceCompile>
+ <Culture>0x0409</Culture>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\Debug\TestRunner.bsc</OutputFile>
+ </Bscmake>
+ <Link>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <LinkDLL>true</LinkDLL>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ <ModuleDefinitionFile>.\TestRunner.def</ModuleDefinitionFile>
+ <OutputFile>Debug\testrunnerd.dll</OutputFile>
+ <ImportLibrary>.\Debug\testrunnerd.lib</ImportLibrary>
+ <AdditionalDependencies>..\..\..\lib\cppunitd.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">
<ClCompile>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
< at >< at > -189,6 +312,56 < at >< at > copy "$(TargetDir)$(TargetName).lib" ..\..\..\lib\$(TargetName).lib</Command>
<AdditionalDependencies>..\..\..\lib\cppunit.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">
+ <ClCompile>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <StringPooling>true</StringPooling>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <Optimization>MaxSpeed</Optimization>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <WarningLevel>Level3</WarningLevel>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
+ <DebugInformationFormat>OldStyle</DebugInformationFormat>
+ <AdditionalIncludeDirectories>..\..\..\include;..\..\..\include\msvc6;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>NDEBUG;_AFXEXT;_WINDOWS;_WINDLL;WIN32;OEMRESOURCE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AssemblerListingLocation>.\ReleaseUnicode\</AssemblerListingLocation>
+ <PrecompiledHeaderOutputFile>.\ReleaseUnicode\TestRunner.pch</PrecompiledHeaderOutputFile>
+ <PrecompiledHeader>Use</PrecompiledHeader>
+ <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
+ <ObjectFileName>.\ReleaseUnicode\</ObjectFileName>
+ <ProgramDataBaseFileName>.\ReleaseUnicode\</ProgramDataBaseFileName>
+ </ClCompile>
+ <PostBuildEvent>
+ <Command>copy "$(TargetPath)" ..\..\..\lib\$(TargetName).dll
+copy "$(TargetDir)$(TargetName).lib" ..\..\..\lib\$(TargetName).lib</Command>
+ <Message>Copying target to lib/</Message>
+ </PostBuildEvent>
+ <Midl>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <TypeLibraryName>.\ReleaseUnicode\TestRunner.tlb</TypeLibraryName>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <RedirectOutputAndErrors>NUL</RedirectOutputAndErrors>
+ </Midl>
+ <ResourceCompile>
+ <Culture>0x0409</Culture>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\ReleaseUnicode\TestRunner.bsc</OutputFile>
+ </Bscmake>
+ <Link>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <LinkDLL>true</LinkDLL>
+ <SubSystem>Windows</SubSystem>
+ <ModuleDefinitionFile>.\TestRunner.def</ModuleDefinitionFile>
+ <OutputFile>ReleaseUnicode\testrunneru.dll</OutputFile>
+ <ImportLibrary>.\ReleaseUnicode\testrunneru.lib</ImportLibrary>
+ <AdditionalDependencies>..\..\..\lib\cppunit.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">
<ClCompile>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
< at >< at > -241,6 +414,56 < at >< at > copy "$(TargetDir)$(TargetName).lib" ..\..\..\lib\$(TargetName).lib</Command>
<AdditionalDependencies>..\..\..\lib\cppunitd.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">
+ <ClCompile>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+ <FunctionLevelLinking>false</FunctionLevelLinking>
+ <Optimization>Disabled</Optimization>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <WarningLevel>Level3</WarningLevel>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
+ <AdditionalIncludeDirectories>..\..\..\include;..\..\..\include\msvc6;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_DEBUG;_AFXEXT;_WINDOWS;_WINDLL;WIN32;OEMRESOURCE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AssemblerListingLocation>.\DebugUnicode\</AssemblerListingLocation>
+ <BrowseInformation>true</BrowseInformation>
+ <PrecompiledHeaderOutputFile>.\DebugUnicode\TestRunner.pch</PrecompiledHeaderOutputFile>
+ <PrecompiledHeader>Use</PrecompiledHeader>
+ <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
+ <ObjectFileName>.\DebugUnicode\</ObjectFileName>
+ <ProgramDataBaseFileName>.\DebugUnicode\</ProgramDataBaseFileName>
+ </ClCompile>
+ <PostBuildEvent>
+ <Command>copy "$(TargetPath)" ..\..\..\lib\$(TargetName).dll
+copy "$(TargetDir)$(TargetName).lib" ..\..\..\lib\$(TargetName).lib</Command>
+ <Message>Copying target to lib/</Message>
+ </PostBuildEvent>
+ <Midl>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <TypeLibraryName>.\DebugUnicode\TestRunner.tlb</TypeLibraryName>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <RedirectOutputAndErrors>NUL</RedirectOutputAndErrors>
+ </Midl>
+ <ResourceCompile>
+ <Culture>0x0409</Culture>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\DebugUnicode\TestRunner.bsc</OutputFile>
+ </Bscmake>
+ <Link>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <LinkDLL>true</LinkDLL>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ <ModuleDefinitionFile>.\TestRunner.def</ModuleDefinitionFile>
+ <OutputFile>DebugUnicode\testrunnerud.dll</OutputFile>
+ <ImportLibrary>.\DebugUnicode\testrunnerud.lib</ImportLibrary>
+ <AdditionalDependencies>..\..\..\lib\cppunitd.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
< at >< at > -292,6 +515,56 < at >< at > copy "$(TargetDir)$(TargetName).lib" ..\..\..\lib\$(TargetName).lib</Command>
<AdditionalDependencies>..\..\..\lib\cppunit.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <StringPooling>true</StringPooling>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <Optimization>MaxSpeed</Optimization>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <WarningLevel>Level3</WarningLevel>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
+ <DebugInformationFormat>OldStyle</DebugInformationFormat>
+ <AdditionalIncludeDirectories>..\..\..\include;..\..\..\include\msvc6;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>NDEBUG;_AFXEXT;_WINDOWS;_WINDLL;WIN32;OEMRESOURCE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AssemblerListingLocation>.\Release\</AssemblerListingLocation>
+ <PrecompiledHeaderOutputFile>.\Release\TestRunner.pch</PrecompiledHeaderOutputFile>
+ <PrecompiledHeader>Use</PrecompiledHeader>
+ <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
+ <ObjectFileName>.\Release\</ObjectFileName>
+ <ProgramDataBaseFileName>.\Release\</ProgramDataBaseFileName>
+ </ClCompile>
+ <PostBuildEvent>
+ <Command>copy "$(TargetPath)" ..\..\..\lib\$(TargetName).dll
+copy "$(TargetDir)$(TargetName).lib" ..\..\..\lib\$(TargetName).lib</Command>
+ <Message>Copying target to lib/</Message>
+ </PostBuildEvent>
+ <Midl>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <TypeLibraryName>.\Release\TestRunner.tlb</TypeLibraryName>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <RedirectOutputAndErrors>NUL</RedirectOutputAndErrors>
+ </Midl>
+ <ResourceCompile>
+ <Culture>0x0409</Culture>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\Release\TestRunner.bsc</OutputFile>
+ </Bscmake>
+ <Link>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <LinkDLL>true</LinkDLL>
+ <SubSystem>Windows</SubSystem>
+ <ModuleDefinitionFile>.\TestRunner.def</ModuleDefinitionFile>
+ <OutputFile>.\Release\TestRunner.dll</OutputFile>
+ <ImportLibrary>.\Release\TestRunner.lib</ImportLibrary>
+ <AdditionalDependencies>..\..\..\lib\cppunit.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
<ItemGroup>
<CustomBuild Include="res\errortype.bmp" />
<CustomBuild Include="res\test_type.bmp" />
< at >< at > -301,46 +574,70 < at >< at > copy "$(TargetDir)$(TargetName).lib" ..\..\..\lib\$(TargetName).lib</Command>
<CustomBuild Include="res\tfwkui_r.bmp" />
<CustomBuild Include="TestRunner.def">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</CustomBuild>
<CustomBuild Include="ReadMe.txt" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="DynamicWindow\cdxCDynamicBar.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
... etc. - the rest is truncated
</pre>
Libreoffice Gerrit user
2013-05-25T20:45:22
-
core.git: l10ntools/source
http://comments.gmane.org/gmane.comp.documentfoundation.libreoffice.scm/27748
<pre> l10ntools/source/export.cxx | 2 +-
l10ntools/source/helper.cxx | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
New commits:
commit f21a2374dc623604d26cec5ec3d5a8f7a8958b63
Author: Zolnai Tamás <zolnaitamas2000< at >gmail.com>
Date: Sat May 25 22:23:57 2013 +0200
Fix some escaping bug in l10ntools
1. A typo in export.cxx makes not working replacing
2. EscapeAll() ignored single backlash characters
Change-Id: I1a5309778acdd601391f643ebf3c66d04a6601d4
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index 5d285ad..c15d81f 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
< at >< at > -1201,7 +1201,7 < at >< at > void Export::ConvertMergeContent( OString &rText )
sal_Bool bNoClose = !rText.endsWith("\\\"");
- rText = rText.replaceAll("\\\"'","\'"); // Temporary: until PO files contain escaped single quotes
+ rText = rText.replaceAll("\\\'","\'"); // Temporary: until PO files contain escaped single quotes
// (Maybe next PO update solve this)
rText =
helper::escapeAll(
diff --git a/l10ntools/source/helper.cxx b/l10ntools/source/helper.cxx
index 6c3a0455..85bfe4a 100644
--- a/l10ntools/source/helper.cxx
+++ b/l10ntools/source/helper.cxx
< at >< at > -46,6 +46,10 < at >< at > OString unEscapeAll(
sReturn.append(rUnEscaped[nEscapedOne/2]);
++nIndex;
}
+ else
+ {
+ sReturn.append(rText[nIndex]);
+ }
}
else
sReturn.append(rText[nIndex]);
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits< at >lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
</pre>
Zolnai Tamás
2013-05-25T20:24:41
-
mso-dumper.git: src/docrecord.py
http://comments.gmane.org/gmane.comp.documentfoundation.libreoffice.scm/27747
<pre> src/docrecord.py | 31 +++++++++++++++++--------------
1 file changed, 17 insertions(+), 14 deletions(-)
New commits:
commit e9cae449e8121de7f6b042efd36b5697eb9e3e7b
Author: Miklos Vajna <vmiklos< at >suse.cz>
Date: Sat May 25 21:26:45 2013 +0200
STD: guard against reading too much
Triggered by fdo49108-1.doc.
diff --git a/src/docrecord.py b/src/docrecord.py
index c2a73d0..2e01e47 100644
--- a/src/docrecord.py
+++ b/src/docrecord.py
< at >< at > -2313,14 +2313,15 < at >< at > class Stdf(DOCDirStream):
self.stdfBase = StdfBase(self.bytes, self.mainStream, self.pos)
self.stdfBase.dump()
self.pos += self.stdfBase.size
- stsh = self.std.lpstd.stsh # root of the stylesheet table
- cbSTDBaseInFile = stsh.lpstshi.stshi.stshif.cbSTDBaseInFile
- print '<stdfPost2000OrNone cbSTDBaseInFile="%s">' % hex(cbSTDBaseInFile)
- if cbSTDBaseInFile == 0x0012:
- stdfPost2000 = StdfPost2000(self)
- stdfPost2000.dump()
- self.pos = stdfPost2000.pos
- print '</stdfPost2000OrNone>'
+ if self.pos - self.std.pos < self.std.size:
+ stsh = self.std.lpstd.stsh # root of the stylesheet table
+ cbSTDBaseInFile = stsh.lpstshi.stshi.stshif.cbSTDBaseInFile
+ print '<stdfPost2000OrNone cbSTDBaseInFile="%s">' % hex(cbSTDBaseInFile)
+ if cbSTDBaseInFile == 0x0012:
+ stdfPost2000 = StdfPost2000(self)
+ stdfPost2000.dump()
+ self.pos = stdfPost2000.pos
+ print '</stdfPost2000OrNone>'
print '</stdf>'
class Xst(DOCDirStream):
< at >< at > -2566,6 +2567,7 < at >< at > class STD(DOCDirStream):
DOCDirStream.__init__(self, lpstd.bytes, mainStream = lpstd.mainStream)
self.lpstd = lpstd
self.pos = lpstd.pos
+ self.posOrig = self.pos
self.size = lpstd.cbStd
def dump(self):
< at >< at > -2573,12 +2575,13 < at >< at > class STD(DOCDirStream):
self.stdf = Stdf(self)
self.stdf.dump()
self.pos = self.stdf.pos
- xstzName = Xstz(self)
- xstzName.dump()
- self.pos = xstzName.pos
- grLPUpxSw = GrLPUpxSw(self)
- grLPUpxSw.dump()
- self.pos = grLPUpxSw.pos
+ if self.pos - self.posOrig < self.size:
+ xstzName = Xstz(self)
+ xstzName.dump()
+ self.pos = xstzName.pos
+ grLPUpxSw = GrLPUpxSw(self)
+ grLPUpxSw.dump()
+ self.pos = grLPUpxSw.pos
print '</std>'
class LPStd(DOCDirStream):
</pre>
Miklos Vajna
2013-05-25T19:27:33
-
core.git: Branch 'libreoffice-4-1' -translations
http://comments.gmane.org/gmane.comp.documentfoundation.libreoffice.scm/27746
<pre> translations | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0c9b9892168940b32b680b82b56ebd30ccaf03df
Author: Andras Timar <atimar< at >suse.com>
Date: Sat May 25 20:03:16 2013 +0200
Updated core
Project: translations 95ad094a5398f83e05fade22a13a6fefe3307129
diff --git a/translations b/translations
index ede3fe6..95ad094 160000
--- a/translations
+++ b/translations
< at >< at > -1 +1 < at >< at >
-Subproject commit ede3fe62d4b30ebe82d2e2b837bd5d8247b73438
+Subproject commit 95ad094a5398f83e05fade22a13a6fefe3307129
</pre>
Andras Timar
2013-05-25T19:04:53
-
core.git: sw/source
http://comments.gmane.org/gmane.comp.documentfoundation.libreoffice.scm/27745
<pre> sw/source/core/inc/flowfrm.hxx | 36 +--
sw/source/core/layout/flowfrm.cxx | 349 +++++++++++++++++++-------------------
sw/source/core/layout/sectfrm.cxx | 4
3 files changed, 195 insertions(+), 194 deletions(-)
New commits:
commit dc54d78398bc7bf464ac02b241086ed6f44ba2de
Author: Miklos Vajna <vmiklos< at >suse.cz>
Date: Sat May 25 19:50:01 2013 +0200
SwFlowFrm: rename member variables missing their prefix
Change-Id: Id7d1271408232e37aa23373dcd1ae6872ac8574b
diff --git a/sw/source/core/inc/flowfrm.hxx b/sw/source/core/inc/flowfrm.hxx
index d7be42d..2a75f9c 100644
--- a/sw/source/core/inc/flowfrm.hxx
+++ b/sw/source/core/inc/flowfrm.hxx
< at >< at > -70,7 +70,7 < at >< at > class SwFlowFrm
friend class SwNode2LayImpl;
- SwFrm &rThis;
+ SwFrm& m_rThis;
// helper methods for MoveSubTree()
static SwLayoutFrm *CutTree( SwFrm* );
< at >< at > -82,7 +82,7 < at >< at > class SwFlowFrm
pages can be skipped at the same time. In addition, it is evaluated by
the MoveBwd() method in TabFrm.
*/
- static sal_Bool bMoveBwdJump;
+ static sal_Bool m_bMoveBwdJump;
/** helper method to determine previous frame for calculation of the
upper space
< at >< at > -114,9 +114,9 < at >< at > protected:
SwFlowFrm *m_pFollow;
SwFlowFrm *m_pPrecede;
- sal_Bool bLockJoin :1; // if sal_True than joins (and thus deletes) are prohibited!
- sal_Bool bUndersized:1; // I am smaller than needed
- sal_Bool bFlyLock :1; // stop positioning of at-character flyframes
+ sal_Bool m_bLockJoin :1; // if sal_True than joins (and thus deletes) are prohibited!
+ sal_Bool m_bUndersized:1; // I am smaller than needed
+ sal_Bool m_bFlyLock :1; // stop positioning of at-character flyframes
// checks if forward flow makes sense to prevent infinite moves
inline sal_Bool IsFwdMoveAllowed();
< at >< at > -133,8 +133,8 < at >< at > protected:
*/
sal_uInt8 BwdMoveNecessary( const SwPageFrm *pPage, const SwRect &rRect );
- void LockJoin() { bLockJoin = sal_True; }
- void UnlockJoin() { bLockJoin = sal_False; }
+ void LockJoin() { m_bLockJoin = sal_True; }
+ void UnlockJoin() { m_bLockJoin = sal_False; }
sal_Bool CheckMoveFwd( bool& rbMakePage, sal_Bool bKeep, sal_Bool bMovedBwd );
sal_Bool MoveFwd( sal_Bool bMakePage, sal_Bool bPageBreak, sal_Bool bMoveAlways = sal_False );
< at >< at > -145,14 +145,14 < at >< at > public:
SwFlowFrm( SwFrm &rFrm );
virtual ~SwFlowFrm();
- const SwFrm *GetFrm() const { return &rThis; }
- SwFrm *GetFrm() { return &rThis; }
+ const SwFrm *GetFrm() const { return &m_rThis; }
+ SwFrm *GetFrm() { return &m_rThis; }
- static sal_Bool IsMoveBwdJump() { return bMoveBwdJump; }
- static void SetMoveBwdJump( sal_Bool bNew ){ bMoveBwdJump = bNew; }
+ static sal_Bool IsMoveBwdJump() { return m_bMoveBwdJump; }
+ static void SetMoveBwdJump( sal_Bool bNew ){ m_bMoveBwdJump = bNew; }
- inline void SetUndersized( const sal_Bool bNew ) { bUndersized = bNew; }
- inline sal_Bool IsUndersized() const { return bUndersized; }
+ inline void SetUndersized( const sal_Bool bNew ) { m_bUndersized = bNew; }
+ inline sal_Bool IsUndersized() const { return m_bUndersized; }
sal_Bool IsPrevObjMove() const;
< at >< at > -169,8 +169,8 < at >< at > public:
const SwFlowFrm *GetPrecede() const { return m_pPrecede; }
SwFlowFrm *GetPrecede() { return m_pPrecede; }
- sal_Bool IsJoinLocked() const { return bLockJoin; }
- sal_Bool IsAnyJoinLocked() const { return bLockJoin || HasLockedFollow(); }
+ sal_Bool IsJoinLocked() const { return m_bLockJoin; }
+ sal_Bool IsAnyJoinLocked() const { return m_bLockJoin || HasLockedFollow(); }
sal_Bool IsPageBreak( sal_Bool bAct ) const;
sal_Bool IsColBreak( sal_Bool bAct ) const;
< at >< at > -221,8 +221,8 < at >< at > public:
void CheckKeep();
- void SetFlyLock( sal_Bool bNew ){ bFlyLock = bNew; }
- sal_Bool IsFlyLock() const { return bFlyLock; }
+ void SetFlyLock( sal_Bool bNew ){ m_bFlyLock = bNew; }
+ sal_Bool IsFlyLock() const { return m_bFlyLock; }
// Casting of a Frm into a FlowFrm (if it is one, otherwise 0)
// These methods need to be customized in subclasses!
< at >< at > -232,7 +232,7 < at >< at > public:
inline sal_Bool SwFlowFrm::IsFwdMoveAllowed()
{
- return rThis.GetIndPrev() != 0;
+ return m_rThis.GetIndPrev() != 0;
}
#endif
diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx
index 14bfc39..5158525 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
< at >< at > -58,7 +58,7 < at >< at >
#include <fmtfollowtextflow.hxx>
#include <switerator.hxx>
-sal_Bool SwFlowFrm::bMoveBwdJump = sal_False;
+sal_Bool SwFlowFrm::m_bMoveBwdJump = sal_False;
/*************************************************************************
< at >< at > -69,12 +69,12 < at >< at > sal_Bool SwFlowFrm::bMoveBwdJump = sal_False;
SwFlowFrm::SwFlowFrm( SwFrm &rFrm ) :
- rThis( rFrm ),
+ m_rThis( rFrm ),
m_pFollow( 0 ),
m_pPrecede( 0 ),
- bLockJoin( false ),
- bUndersized( false ),
- bFlyLock( false )
+ m_bLockJoin( false ),
+ m_bUndersized( false ),
+ m_bFlyLock( false )
{}
SwFlowFrm::~SwFlowFrm()
< at >< at > -139,7 +139,7 < at >< at > sal_Bool SwFlowFrm::IsKeepFwdMoveAllowed()
// If all the predecessors up to the first of the chain have
// the 'keep' attribute set, and the first of the chain's
// IsFwdMoveAllowed returns sal_False, then we're not allowed to move.
- SwFrm *pFrm = &rThis;
+ SwFrm *pFrm = &m_rThis;
if ( !pFrm->IsInFtn() )
do
{ if ( pFrm->GetAttrSet()->GetKeep().GetValue() )
< at >< at > -166,7 +166,7 < at >< at > void SwFlowFrm::CheckKeep()
{
// Kick off the "last" predecessor with a 'keep' attribute, because
// it's possible for the whole troop to move back.
- SwFrm *pPre = rThis.GetIndPrev();
+ SwFrm *pPre = m_rThis.GetIndPrev();
if( pPre->IsSctFrm() )
{
SwFrm *pLast = ((SwSectionFrm*)pPre)->FindLastCntnt();
< at >< at > -209,11 +209,11 < at >< at > sal_Bool SwFlowFrm::IsKeep( const SwAttrSet& rAttrs, bool bCheckIfLastRowShouldK
// if there are any break after attributes set at rAttrs
// or break before attributes set for the next content (or next table)
sal_Bool bKeep = bCheckIfLastRowShouldKeep ||
- ( !rThis.IsInFtn() &&
- ( !rThis.IsInTab() || rThis.IsTabFrm() ) &&
+ ( !m_rThis.IsInFtn() &&
+ ( !m_rThis.IsInTab() || m_rThis.IsTabFrm() ) &&
rAttrs.GetKeep().GetValue() );
- OSL_ENSURE( !bCheckIfLastRowShouldKeep || rThis.IsTabFrm(),
+ OSL_ENSURE( !bCheckIfLastRowShouldKeep || m_rThis.IsTabFrm(),
"IsKeep with bCheckIfLastRowShouldKeep should only be used for tabfrms" );
// Ignore keep attribute if there are break situations:
< at >< at > -233,7 +233,7 < at >< at > sal_Bool SwFlowFrm::IsKeep( const SwAttrSet& rAttrs, bool bCheckIfLastRowShouldK
if ( bKeep )
{
SwFrm *pNxt;
- if( 0 != (pNxt = rThis.FindNextCnt()) &&
+ if( 0 != (pNxt = m_rThis.FindNextCnt()) &&
(!m_pFollow || pNxt != m_pFollow->GetFrm()))
{
// #135914#
< at >< at > -243,7 +243,7 < at >< at > sal_Bool SwFlowFrm::IsKeep( const SwAttrSet& rAttrs, bool bCheckIfLastRowShouldK
{
const SwSection* pThisSection = 0;
const SwSection* pNextSection = 0;
- const SwSectionFrm* pThisSectionFrm = rThis.FindSctFrm();
+ const SwSectionFrm* pThisSectionFrm = m_rThis.FindSctFrm();
const SwSectionFrm* pNextSectionFrm = pNxt->FindSctFrm();
if ( pThisSectionFrm )
< at >< at > -263,7 +263,7 < at >< at > sal_Bool SwFlowFrm::IsKeep( const SwAttrSet& rAttrs, bool bCheckIfLastRowShouldK
if ( pNxt->IsInTab() )
{
SwTabFrm* pTab = pNxt->FindTabFrm();
- if ( ! rThis.IsInTab() || rThis.FindTabFrm() != pTab )
+ if ( ! m_rThis.IsInTab() || m_rThis.FindTabFrm() != pTab )
pSet = &pTab->GetFmt()->GetAttrSet();
}
< at >< at > -343,18 +343,18 < at >< at > sal_uInt8 SwFlowFrm::BwdMoveNecessary( const SwPageFrm *pPage, const SwRect &rRe
if ( aRect.IsOver( rRect ) &&
rFmt.GetSurround().GetSurround() != SURROUND_THROUGHT )
{
- if( rThis.IsLayoutFrm() && //Fly Lower of This?
- Is_Lower_Of( &rThis, pObj->GetDrawObj() ) )
+ if( m_rThis.IsLayoutFrm() && //Fly Lower of This?
+ Is_Lower_Of( &m_rThis, pObj->GetDrawObj() ) )
continue;
if( pObj->ISA(SwFlyFrm) )
{
const SwFlyFrm *pFly = static_cast<const SwFlyFrm*>(pObj);
- if ( pFly->IsAnLower( &rThis ) )//This Lower of Fly?
+ if ( pFly->IsAnLower( &m_rThis ) )//This Lower of Fly?
continue;
}
const SwFrm* pAnchor = pObj->GetAnchorFrm();
- if ( pAnchor == &rThis )
+ if ( pAnchor == &m_rThis )
{
nRet |= 1;
continue;
< at >< at > -362,7 +362,7 < at >< at > sal_uInt8 SwFlowFrm::BwdMoveNecessary( const SwPageFrm *pPage, const SwRect &rRe
// Don't do this if the object is anchored behind me in the text
// flow, because then I wouldn't evade it.
- if ( ::IsFrmInSameKontext( pAnchor, &rThis ) )
+ if ( ::IsFrmInSameKontext( pAnchor, &m_rThis ) )
{
if ( rFmt.GetAnchor().GetAnchorId() == FLY_AT_PARA )
{
< at >< at > -376,15 +376,15 < at >< at > sal_uInt8 SwFlowFrm::BwdMoveNecessary( const SwPageFrm *pPage, const SwRect &rRe
if( ULONG_MAX == nIndex )
{
const SwNode *pNode;
- if ( rThis.IsCntntFrm() )
- pNode = ((SwCntntFrm&)rThis).GetNode();
- else if( rThis.IsSctFrm() )
- pNode = ((SwSectionFmt*)((SwSectionFrm&)rThis).
+ if ( m_rThis.IsCntntFrm() )
+ pNode = ((SwCntntFrm&)m_rThis).GetNode();
+ else if( m_rThis.IsSctFrm() )
+ pNode = ((SwSectionFmt*)((SwSectionFrm&)m_rThis).
GetFmt())->GetSectionNode();
else
{
- OSL_ENSURE( rThis.IsTabFrm(), "new FowFrm?" );
- pNode = ((SwTabFrm&)rThis).GetTable()->
+ OSL_ENSURE( m_rThis.IsTabFrm(), "new FowFrm?" );
+ pNode = ((SwTabFrm&)m_rThis).GetTable()->
GetTabSortBoxes()[0]->GetSttNd()->FindTableNode();
}
nIndex = pNode->GetIndex();
< at >< at > -599,16 +599,16 < at >< at > sal_Bool SwFlowFrm::PasteTree( SwFrm *pStart, SwLayoutFrm *pParent, SwFrm *pSibl
void SwFlowFrm::MoveSubTree( SwLayoutFrm* pParent, SwFrm* pSibling )
{
OSL_ENSURE( pParent, "No parent given." );
- OSL_ENSURE( rThis.GetUpper(), "Where are we coming from?" );
+ OSL_ENSURE( m_rThis.GetUpper(), "Where are we coming from?" );
// Be economical with notifications if an action is running.
- ViewShell *pSh = rThis.getRootFrm()->GetCurrShell();
+ ViewShell *pSh = m_rThis.getRootFrm()->GetCurrShell();
const SwViewImp *pImp = pSh ? pSh->Imp() : 0;
const bool bComplete = pImp && pImp->IsAction() && pImp->GetLayAction().IsComplete();
if ( !bComplete )
{
- SwFrm *pPre = rThis.GetIndPrev();
+ SwFrm *pPre = m_rThis.GetIndPrev();
if ( pPre )
{
pPre->SetRetouche();
< at >< at > -621,15 +621,16 < at >< at > void SwFlowFrm::MoveSubTree( SwLayoutFrm* pParent, SwFrm* pSibling )
pPre->InvalidatePage();
}
else
- { rThis.GetUpper()->SetCompletePaint();
- rThis.GetUpper()->InvalidatePage();
+ {
+ m_rThis.GetUpper()->SetCompletePaint();
+ m_rThis.GetUpper()->InvalidatePage();
}
}
- SwPageFrm *pOldPage = rThis.FindPageFrm();
+ SwPageFrm *pOldPage = m_rThis.FindPageFrm();
- SwLayoutFrm *pOldParent = CutTree( &rThis );
- const sal_Bool bInvaLay = PasteTree( &rThis, pParent, pSibling, pOldParent );
+ SwLayoutFrm *pOldParent = CutTree( &m_rThis );
+ const sal_Bool bInvaLay = PasteTree( &m_rThis, pParent, pSibling, pOldParent );
// If, by cutting & pasting, an empty SectionFrm came into existence, it should
// disappear automatically.
< at >< at > -645,37 +646,37 < at >< at > void SwFlowFrm::MoveSubTree( SwLayoutFrm* pParent, SwFrm* pSibling )
}
// If we're in a column section, we'd rather not call Calc "from below"
- if( !rThis.IsInSct() &&
- ( !rThis.IsInTab() || ( rThis.IsTabFrm() && !rThis.GetUpper()->IsInTab() ) ) )
- rThis.GetUpper()->Calc();
- else if( rThis.GetUpper()->IsSctFrm() )
+ if( !m_rThis.IsInSct() &&
+ ( !m_rThis.IsInTab() || ( m_rThis.IsTabFrm() && !m_rThis.GetUpper()->IsInTab() ) ) )
+ m_rThis.GetUpper()->Calc();
+ else if( m_rThis.GetUpper()->IsSctFrm() )
{
- SwSectionFrm* pTmpSct = (SwSectionFrm*)rThis.GetUpper();
+ SwSectionFrm* pTmpSct = (SwSectionFrm*)m_rThis.GetUpper();
sal_Bool bOld = pTmpSct->IsCntntLocked();
pTmpSct->SetCntntLock( sal_True );
pTmpSct->Calc();
if( !bOld )
pTmpSct->SetCntntLock( sal_False );
}
- SwPageFrm *pPage = rThis.FindPageFrm();
+ SwPageFrm *pPage = m_rThis.FindPageFrm();
if ( pOldPage != pPage )
{
- rThis.InvalidatePage( pPage );
- if ( rThis.IsLayoutFrm() )
+ m_rThis.InvalidatePage( pPage );
+ if ( m_rThis.IsLayoutFrm() )
{
- SwCntntFrm *pCnt = ((SwLayoutFrm*)&rThis)->ContainsCntnt();
+ SwCntntFrm *pCnt = ((SwLayoutFrm*)&m_rThis)->ContainsCntnt();
if ( pCnt )
pCnt->InvalidatePage( pPage );
}
else if ( pSh && pSh->GetDoc()->GetLineNumberInfo().IsRestartEachPage()
- && pPage->FindFirstBodyCntnt() == &rThis )
+ && pPage->FindFirstBodyCntnt() == &m_rThis )
{
- rThis._InvalidateLineNum();
+ m_rThis._InvalidateLineNum();
}
}
if ( bInvaLay || (pSibling && pSibling->IsLayoutFrm()) )
- rThis.GetUpper()->InvalidatePage( pPage );
+ m_rThis.GetUpper()->InvalidatePage( pPage );
}
/*************************************************************************
< at >< at > -1130,11 +1131,11 < at >< at > sal_Bool SwFlowFrm::IsPrevObjMove() const
// to insert a break if required.
//!!!!!!!!!!!Hack!!!!!!!!!!!
- const ViewShell *pSh = rThis.getRootFrm()->GetCurrShell();
+ const ViewShell *pSh = m_rThis.getRootFrm()->GetCurrShell();
if( pSh && pSh->GetViewOptions()->getBrowseMode() )
return sal_False;
- SwFrm *pPre = rThis.FindPrev();
+ SwFrm *pPre = m_rThis.FindPrev();
if ( pPre && pPre->GetDrawObjs() )
{
< at >< at > -1204,16 +1205,16 < at >< at > sal_Bool SwFlowFrm::IsPrevObjMove() const
sal_Bool SwFlowFrm::IsPageBreak( sal_Bool bAct ) const
{
- if ( !IsFollow() && rThis.IsInDocBody() &&
- ( !rThis.IsInTab() || ( rThis.IsTabFrm() && !rThis.GetUpper()->IsInTab() ) ) ) // i66968
+ if ( !IsFollow() && m_rThis.IsInDocBody() &&
+ ( !m_rThis.IsInTab() || ( m_rThis.IsTabFrm() && !m_rThis.GetUpper()->IsInTab() ) ) ) // i66968
{
- const ViewShell *pSh = rThis.getRootFrm()->GetCurrShell();
+ const ViewShell *pSh = m_rThis.getRootFrm()->GetCurrShell();
if( pSh && pSh->GetViewOptions()->getBrowseMode() )
return sal_False;
- const SwAttrSet *pSet = rThis.GetAttrSet();
+ const SwAttrSet *pSet = m_rThis.GetAttrSet();
// Determine predecessor
- const SwFrm *pPrev = rThis.FindPrev();
+ const SwFrm *pPrev = m_rThis.FindPrev();
while ( pPrev && ( !pPrev->IsInDocBody() ||
( pPrev->IsTxtFrm() && ((SwTxtFrm*)pPrev)->IsHiddenNow() ) ) )
pPrev = pPrev->FindPrev();
< at >< at > -1222,11 +1223,11 < at >< at > sal_Bool SwFlowFrm::IsPageBreak( sal_Bool bAct ) const
{
OSL_ENSURE( pPrev->IsInDocBody(), "IsPageBreak: Not in DocBody?" );
if ( bAct )
- { if ( rThis.FindPageFrm() == pPrev->FindPageFrm() )
+ { if ( m_rThis.FindPageFrm() == pPrev->FindPageFrm() )
return sal_False;
}
else
- { if ( rThis.FindPageFrm() != pPrev->FindPageFrm() )
+ { if ( m_rThis.FindPageFrm() != pPrev->FindPageFrm() )
return sal_False;
}
< at >< at > -1266,14 +1267,14 < at >< at > sal_Bool SwFlowFrm::IsPageBreak( sal_Bool bAct ) const
sal_Bool SwFlowFrm::IsColBreak( sal_Bool bAct ) const
{
- if ( !IsFollow() && (rThis.IsMoveable() || bAct) )
+ if ( !IsFollow() && (m_rThis.IsMoveable() || bAct) )
{
- const SwFrm *pCol = rThis.FindColFrm();
+ const SwFrm *pCol = m_rThis.FindColFrm();
if ( pCol )
{
// Determine predecessor
- const SwFrm *pPrev = rThis.FindPrev();
- while( pPrev && ( ( !pPrev->IsInDocBody() && !rThis.IsInFly() ) ||
+ const SwFrm *pPrev = m_rThis.FindPrev();
+ while( pPrev && ( ( !pPrev->IsInDocBody() && !m_rThis.IsInFly() ) ||
( pPrev->IsTxtFrm() && ((SwTxtFrm*)pPrev)->IsHiddenNow() ) ) )
pPrev = pPrev->FindPrev();
< at >< at > -1288,7 +1289,7 < at >< at > sal_Bool SwFlowFrm::IsColBreak( sal_Bool bAct ) const
return sal_False;
}
- const SvxBreak eBreak = rThis.GetAttrSet()->GetBreak().GetBreak();
+ const SvxBreak eBreak = m_rThis.GetAttrSet()->GetBreak().GetBreak();
if ( eBreak == SVX_BREAK_COLUMN_BEFORE ||
eBreak == SVX_BREAK_COLUMN_BOTH )
return sal_True;
< at >< at > -1307,9 +1308,9 < at >< at > sal_Bool SwFlowFrm::IsColBreak( sal_Bool bAct ) const
sal_Bool SwFlowFrm::HasParaSpaceAtPages( sal_Bool bSct ) const
{
- if( rThis.IsInSct() )
+ if( m_rThis.IsInSct() )
{
- const SwFrm* pTmp = rThis.GetUpper();
+ const SwFrm* pTmp = m_rThis.GetUpper();
while( pTmp )
{
if( pTmp->IsCellFrm() || pTmp->IsFlyFrm() ||
< at >< at > -1327,17 +1328,17 < at >< at > sal_Bool SwFlowFrm::HasParaSpaceAtPages( sal_Bool bSct ) const
OSL_FAIL( "HasParaSpaceAtPages: Where's my page?" );
return sal_False;
}
- if( !rThis.IsInDocBody() || ( rThis.IsInTab() && !rThis.IsTabFrm()) ||
- IsPageBreak( sal_True ) || ( rThis.FindColFrm() && IsColBreak( sal_True ) ) )
+ if( !m_rThis.IsInDocBody() || ( m_rThis.IsInTab() && !m_rThis.IsTabFrm()) ||
+ IsPageBreak( sal_True ) || ( m_rThis.FindColFrm() && IsColBreak( sal_True ) ) )
return sal_True;
- const SwFrm* pTmp = rThis.FindColFrm();
+ const SwFrm* pTmp = m_rThis.FindColFrm();
if( pTmp )
{
if( pTmp->GetPrev() )
return sal_False;
}
else
- pTmp = &rThis;
+ pTmp = &m_rThis;
pTmp = pTmp->FindPageFrm();
return pTmp && !pTmp->GetPrev();
}
< at >< at > -1353,7 +1354,7 < at >< at > const SwFrm* SwFlowFrm::_GetPrevFrmForUpperSpaceCalc( const SwFrm* _pProposedPre
{
const SwFrm* pPrevFrm = _pProposedPrevFrm
? _pProposedPrevFrm
- : rThis.GetPrev();
+ : m_rThis.GetPrev();
// Skip hidden paragraphs and empty sections
while ( pPrevFrm &&
< at >< at > -1368,12 +1369,12 < at >< at > const SwFrm* SwFlowFrm::_GetPrevFrmForUpperSpaceCalc( const SwFrm* _pProposedPre
// Special case: no direct previous frame is found but frame is in footnote
// Search for a previous frame in previous footnote,
// if frame isn't in a section, which is also in the footnote
- if ( !pPrevFrm && rThis.IsInFtn() &&
- ( rThis.IsSctFrm() ||
- !rThis.IsInSct() || !rThis.FindSctFrm()->IsInFtn() ) )
+ if ( !pPrevFrm && m_rThis.IsInFtn() &&
+ ( m_rThis.IsSctFrm() ||
+ !m_rThis.IsInSct() || !m_rThis.FindSctFrm()->IsInFtn() ) )
{
const SwFtnFrm* pPrevFtnFrm =
- static_cast<const SwFtnFrm*>(rThis.FindFtnFrm()->GetPrev());
+ static_cast<const SwFtnFrm*>(m_rThis.FindFtnFrm()->GetPrev());
if ( pPrevFtnFrm )
{
pPrevFrm = pPrevFtnFrm->GetLastLower();
< at >< at > -1465,9 +1466,9 < at >< at > SwTwips SwFlowFrm::CalcUpperSpace( const SwBorderAttrs *pAttrs,
SwFrm* pOwn;
if( !pAttrs )
{
- if( rThis.IsSctFrm() )
+ if( m_rThis.IsSctFrm() )
{
- SwSectionFrm* pFoll = &((SwSectionFrm&)rThis);
+ SwSectionFrm* pFoll = &((SwSectionFrm&)m_rThis);
do
pOwn = pFoll->ContainsAny();
while( !pOwn && 0 != ( pFoll = pFoll->GetFollow() ) );
< at >< at > -1475,19 +1476,19 < at >< at > SwTwips SwFlowFrm::CalcUpperSpace( const SwBorderAttrs *pAttrs,
return 0;
}
else
- pOwn = &rThis;
+ pOwn = &m_rThis;
pAccess= new SwBorderAttrAccess( SwFrm::GetCache(), pOwn );
pAttrs = pAccess->Get();
}
else
{
pAccess = NULL;
- pOwn = &rThis;
+ pOwn = &m_rThis;
}
SwTwips nUpper = 0;
// OD 06.01.2004 #i11859#
{
- const IDocumentSettingAccess* pIDSA = rThis.GetUpper()->GetFmt()->getIDocumentSettingAccess();
+ const IDocumentSettingAccess* pIDSA = m_rThis.GetUpper()->GetFmt()->getIDocumentSettingAccess();
const bool bUseFormerLineSpacing = pIDSA->get(IDocumentSettingAccess::OLD_LINE_SPACING);
if( pPrevFrm )
{
< at >< at > -1511,7 +1512,7 < at >< at > SwTwips SwFlowFrm::CalcUpperSpace( const SwBorderAttrs *pAttrs,
// former consideration
if ( pOwn->IsTxtFrm() )
{
- nAdd = std::max( nAdd, static_cast<SwTxtFrm&>(rThis).GetLineSpace() );
+ nAdd = std::max( nAdd, static_cast<SwTxtFrm&>(m_rThis).GetLineSpace() );
}
nUpper += nAdd;
}
< at >< at > -1533,11 +1534,11 < at >< at > SwTwips SwFlowFrm::CalcUpperSpace( const SwBorderAttrs *pAttrs,
// spacing is built.
if ( bPrevLineSpacingPorportional )
{
- nAdd += static_cast<SwTxtFrm&>(rThis).GetLineSpace( true );
+ nAdd += static_cast<SwTxtFrm&>(m_rThis).GetLineSpace( true );
}
else
{
- nAdd = std::max( nAdd, static_cast<SwTxtFrm&>(rThis).GetLineSpace( true ) );
+ nAdd = std::max( nAdd, static_cast<SwTxtFrm&>(m_rThis).GetLineSpace( true ) );
}
}
nUpper += nAdd;
< at >< at > -1579,11 +1580,11 < at >< at > SwTwips SwFlowFrm::CalcUpperSpace( const SwBorderAttrs *pAttrs,
// spacing is built.
if ( bPrevLineSpacingPorportional )
{
- nAdd += static_cast<SwTxtFrm&>(rThis).GetLineSpace( true );
+ nAdd += static_cast<SwTxtFrm&>(m_rThis).GetLineSpace( true );
}
else
{
- nAdd = std::max( nAdd, static_cast<SwTxtFrm&>(rThis).GetLineSpace( true ) );
+ nAdd = std::max( nAdd, static_cast<SwTxtFrm&>(m_rThis).GetLineSpace( true ) );
}
}
nUpper += nAdd;
< at >< at > -1591,7 +1592,7 < at >< at > SwTwips SwFlowFrm::CalcUpperSpace( const SwBorderAttrs *pAttrs,
}
}
else if ( pIDSA->get(IDocumentSettingAccess::PARA_SPACE_MAX_AT_PAGES) &&
- CastFlowFrm( pOwn )->HasParaSpaceAtPages( rThis.IsSctFrm() ) )
+ CastFlowFrm( pOwn )->HasParaSpaceAtPages( m_rThis.IsSctFrm() ) )
{
nUpper = pAttrs->GetULSpace().GetUpper();
}
< at >< at > -1600,13 +1601,13 < at >< at > SwTwips SwFlowFrm::CalcUpperSpace( const SwBorderAttrs *pAttrs,
// OD 2004-02-26 #i25029# - pass previous frame <pPrevFrm>
// to method <GetTopLine(..)>, if parameter <pPr> is set.
// Note: parameter <pPr> is set, if method is called from <SwTxtFrm::WouldFit(..)>
- nUpper += pAttrs->GetTopLine( rThis, (pPr ? pPrevFrm : 0L) );
+ nUpper += pAttrs->GetTopLine( m_rThis, (pPr ? pPrevFrm : 0L) );
// OD 2004-03-12 #i11860# - consider value of new parameter <_bConsiderGrid>
// and use new method <GetUpperSpaceAmountConsideredForPageGrid(..)>
//consider grid in square page mode
- if ( _bConsiderGrid && rThis.GetUpper()->GetFmt()->GetDoc()->IsSquaredPageMode() )
+ if ( _bConsiderGrid && m_rThis.GetUpper()->GetFmt()->GetDoc()->IsSquaredPageMode() )
{
nUpper += _GetUpperSpaceAmountConsideredForPageGrid( nUpper );
}
< at >< at > -1615,7 +1616,7 < at >< at > SwTwips SwFlowFrm::CalcUpperSpace( const SwBorderAttrs *pAttrs,
delete pAccess;
if (bContextualSpacing && pPrevFrm && lcl_getContextualSpacing(pPrevFrm)
- && lcl_IdenticalStyles(pPrevFrm, &rThis))
+ && lcl_IdenticalStyles(pPrevFrm, &m_rThis))
{
return 0;
}
< at >< at > -1636,9 +1637,9 < at >< at > SwTwips SwFlowFrm::_GetUpperSpaceAmountConsideredForPageGrid(
{
SwTwips nUpperSpaceAmountConsideredForPageGrid = 0;
- if ( rThis.IsInDocBody() && rThis.GetAttrSet()->GetParaGrid().GetValue() )
+ if ( m_rThis.IsInDocBody() && m_rThis.GetAttrSet()->GetParaGrid().GetValue() )
{
- const SwPageFrm* pPageFrm = rThis.FindPageFrm();
+ const SwPageFrm* pPageFrm = m_rThis.FindPageFrm();
GETGRID( pPageFrm )
if( pGrid )
{
< at >< at > -1648,10 +1649,10 < at >< at > SwTwips SwFlowFrm::_GetUpperSpaceAmountConsideredForPageGrid(
const long nGridLineHeight =
pGrid->GetBaseHeight() + pGrid->GetRubyHeight();
- SWRECTFN( (&rThis) )
+ SWRECTFN( (&m_rThis) )
const SwTwips nBodyPrtTop = (pBodyFrm->*fnRect->fnGetPrtTop)();
const SwTwips nProposedPrtTop =
- (*fnRect->fnYInc)( (rThis.Frm().*fnRect->fnGetTop)(),
+ (*fnRect->fnYInc)( (m_rThis.Frm().*fnRect->fnGetTop)(),
_nUpperSpaceWithoutGrid );
const SwTwips nSpaceAbovePrtTop =
< at >< at > -1667,7 +1668,7 < at >< at > SwTwips SwFlowFrm::_GetUpperSpaceAmountConsideredForPageGrid(
const SwTwips nNewUpperSpace =
(*fnRect->fnYDiff)( nNewPrtTop,
- (rThis.Frm().*fnRect->fnGetTop)() );
+ (m_rThis.Frm().*fnRect->fnGetTop)() );
nUpperSpaceAmountConsideredForPageGrid =
nNewUpperSpace - _nUpperSpaceWithoutGrid;
< at >< at > -1701,7 +1702,7 < at >< at > SwTwips SwFlowFrm::_GetUpperSpaceAmountConsideredForPrevFrm() const
GetSpacingValuesOfFrm( (*pPrevFrm), nPrevLowerSpace, nPrevLineSpacing, bDummy );
if ( nPrevLowerSpace > 0 || nPrevLineSpacing > 0 )
{
- const IDocumentSettingAccess* pIDSA = rThis.GetUpper()->GetFmt()->getIDocumentSettingAccess();
+ const IDocumentSettingAccess* pIDSA = m_rThis.GetUpper()->GetFmt()->getIDocumentSettingAccess();
if ( pIDSA->get(IDocumentSettingAccess::PARA_SPACE_MAX) ||
!pIDSA->get(IDocumentSettingAccess::OLD_LINE_SPACING) )
{
< at >< at > -1729,11 +1730,11 < at >< at > SwTwips SwFlowFrm::GetUpperSpaceAmountConsideredForPrevFrmAndPageGrid() const
{
SwTwips nUpperSpaceAmountConsideredForPrevFrmAndPageGrid = 0;
- if ( !rThis.GetUpper()->GetFmt()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::USE_FORMER_OBJECT_POS) )
+ if ( !m_rThis.GetUpper()->GetFmt()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::USE_FORMER_OBJECT_POS) )
{
nUpperSpaceAmountConsideredForPrevFrmAndPageGrid =
_GetUpperSpaceAmountConsideredForPrevFrm() +
- ( rThis.GetUpper()->GetFmt()->GetDoc()->IsSquaredPageMode()
+ ( m_rThis.GetUpper()->GetFmt()->GetDoc()->IsSquaredPageMode()
? _GetUpperSpaceAmountConsideredForPageGrid( CalcUpperSpace( 0, 0, false ) )
: 0 );
}
< at >< at > -1754,27 +1755,27 < at >< at > SwTwips SwFlowFrm::CalcLowerSpace( const SwBorderAttrs* _pAttrs ) const
SwBorderAttrAccess* pAttrAccess = 0L;
if ( !_pAttrs )
{
- pAttrAccess = new SwBorderAttrAccess( SwFrm::GetCache(), &rThis );
+ pAttrAccess = new SwBorderAttrAccess( SwFrm::GetCache(), &m_rThis );
_pAttrs = pAttrAccess->Get();
}
sal_Bool bCommonBorder = sal_True;
- if ( rThis.IsInSct() && rThis.GetUpper()->IsColBodyFrm() )
+ if ( m_rThis.IsInSct() && m_rThis.GetUpper()->IsColBodyFrm() )
{
- const SwSectionFrm* pSectFrm = rThis.FindSctFrm();
+ const SwSectionFrm* pSectFrm = m_rThis.FindSctFrm();
bCommonBorder = pSectFrm->GetFmt()->GetBalancedColumns().GetValue();
}
nLowerSpace = bCommonBorder ?
- _pAttrs->GetBottomLine( rThis ) :
+ _pAttrs->GetBottomLine( m_rThis ) :
_pAttrs->CalcBottomLine();
// #i26250#
// - correct consideration of table frames
// - use new method <CalcAddLowerSpaceAsLastInTableCell(..)>
- if ( ( ( rThis.IsTabFrm() && rThis.GetUpper()->IsInTab() ) ||
+ if ( ( ( m_rThis.IsTabFrm() && m_rThis.GetUpper()->IsInTab() ) ||
// #115759# - no lower spacing, if frame has a follow
- ( rThis.IsInTab() && !GetFollow() ) ) &&
- !rThis.GetIndNext() )
+ ( m_rThis.IsInTab() && !GetFollow() ) ) &&
+ !m_rThis.GetIndNext() )
{
nLowerSpace += CalcAddLowerSpaceAsLastInTableCell( _pAttrs );
}
< at >< at > -1796,9 +1797,9 < at >< at > SwTwips SwFlowFrm::CalcAddLowerSpaceAsLastInTableCell(
{
SwTwips nAdditionalLowerSpace = 0;
- if ( rThis.GetUpper()->GetFmt()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::ADD_PARA_SPACING_TO_TABLE_CELLS) )
+ if ( m_rThis.GetUpper()->GetFmt()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::ADD_PARA_SPACING_TO_TABLE_CELLS) )
{
- const SwFrm* pFrm = &rThis;
+ const SwFrm* pFrm = &m_rThis;
if ( pFrm->IsSctFrm() )
{
const SwSectionFrm* pSectFrm = static_cast<const SwSectionFrm*>(pFrm);
< at >< at > -1814,7 +1815,7 < at >< at > SwTwips SwFlowFrm::CalcAddLowerSpaceAsLastInTableCell(
}
SwBorderAttrAccess* pAttrAccess = 0L;
- if ( !_pAttrs || pFrm != &rThis )
+ if ( !_pAttrs || pFrm != &m_rThis )
{
pAttrAccess = new SwBorderAttrAccess( SwFrm::GetCache(), pFrm );
_pAttrs = pAttrAccess->Get();
< at >< at > -1840,11 +1841,11 < at >< at > SwTwips SwFlowFrm::CalcAddLowerSpaceAsLastInTableCell(
sal_Bool SwFlowFrm::CheckMoveFwd( bool& rbMakePage, sal_Bool bKeep, sal_Bool )
{
- const SwFrm* pNxt = rThis.GetIndNext();
+ const SwFrm* pNxt = m_rThis.GetIndNext();
if ( bKeep && //!bMovedBwd &&
( !pNxt || ( pNxt->IsTxtFrm() && ((SwTxtFrm*)pNxt)->IsEmptyMaster() ) ) &&
- ( 0 != (pNxt = rThis.FindNext()) ) && IsKeepFwdMoveAllowed() )
+ ( 0 != (pNxt = m_rThis.FindNext()) ) && IsKeepFwdMoveAllowed() )
{
if( pNxt->IsSctFrm() )
{ // Don't get fooled by empty SectionFrms
< at >< at > -1862,7 +1863,7 < at >< at > sal_Bool SwFlowFrm::CheckMoveFwd( bool& rbMakePage, sal_Bool bKeep, sal_Bool )
if( pNxt && pNxt->GetValidPosFlag() )
{
bool bMove = false;
- const SwSectionFrm *pSct = rThis.FindSctFrm();
+ const SwSectionFrm *pSct = m_rThis.FindSctFrm();
if( pSct && !pSct->GetValidSizeFlag() )
{
const SwSectionFrm* pNxtSct = pNxt->FindSctFrm();
< at >< at > -1882,7 +1883,7 < at >< at > sal_Bool SwFlowFrm::CheckMoveFwd( bool& rbMakePage, sal_Bool bKeep, sal_Bool )
sal_Bool bMovedFwd = sal_False;
- if ( rThis.GetIndPrev() )
+ if ( m_rThis.GetIndPrev() )
{
if ( IsPrevObjMove() ) // Should we care about objects of the Prev?
{
< at >< at > -1901,11 +1902,11 < at >< at > sal_Bool SwFlowFrm::CheckMoveFwd( bool& rbMakePage, sal_Bool bKeep, sal_Bool )
}
else if ( IsColBreak ( sal_False ) )
{
- const SwPageFrm *pPage = rThis.FindPageFrm();
- SwFrm *pCol = rThis.FindColFrm();
+ const SwPageFrm *pPage = m_rThis.FindPageFrm();
+ SwFrm *pCol = m_rThis.FindColFrm();
do
{ MoveFwd( rbMakePage, sal_False );
- SwFrm *pTmp = rThis.FindColFrm();
+ SwFrm *pTmp = m_rThis.FindColFrm();
if( pTmp != pCol )
{
bMovedFwd = sal_True;
< at >< at > -1914,7 +1915,7 < at >< at > sal_Bool SwFlowFrm::CheckMoveFwd( bool& rbMakePage, sal_Bool bKeep, sal_Bool )
else
break;
} while ( IsColBreak( sal_False ) );
- if ( pPage != rThis.FindPageFrm() )
+ if ( pPage != m_rThis.FindPageFrm() )
rbMakePage = false;
}
}
< at >< at > -1935,26 +1936,26 < at >< at > sal_Bool SwFlowFrm::CheckMoveFwd( bool& rbMakePage, sal_Bool bKeep, sal_Bool )
sal_Bool SwFlowFrm::MoveFwd( sal_Bool bMakePage, sal_Bool bPageBreak, sal_Bool bMoveAlways )
{
//!!!!MoveFtnCntFwd might need to be updated as well.
- SwFtnBossFrm *pOldBoss = rThis.FindFtnBossFrm();
- if ( rThis.IsInFtn() )
- return ((SwCntntFrm&)rThis).MoveFtnCntFwd( bMakePage, pOldBoss );
+ SwFtnBossFrm *pOldBoss = m_rThis.FindFtnBossFrm();
+ if ( m_rThis.IsInFtn() )
+ return ((SwCntntFrm&)m_rThis).MoveFtnCntFwd( bMakePage, pOldBoss );
if( !IsFwdMoveAllowed() && !bMoveAlways )
{
bool bNoFwd = true;
- if( rThis.IsInSct() )
+ if( m_rThis.IsInSct() )
{
- SwFtnBossFrm* pBoss = rThis.FindFtnBossFrm();
+ SwFtnBossFrm* pBoss = m_rThis.FindFtnBossFrm();
bNoFwd = !pBoss->IsInSct() || ( !pBoss->Lower()->GetNext() &&
!pBoss->GetPrev() );
}
// Allow the MoveFwd even if we do not have an IndPrev in these cases:
- if ( rThis.IsInTab() &&
- ( !rThis.IsTabFrm() ||
- ( rThis.GetUpper()->IsInTab() &&
- rThis.GetUpper()->FindTabFrm()->IsFwdMoveAllowed() ) ) &&
- 0 != const_cast<SwFrm&>(rThis).GetNextCellLeaf( MAKEPAGE_NONE ) )
+ if ( m_rThis.IsInTab() &&
+ ( !m_rThis.IsTabFrm() ||
+ ( m_rThis.GetUpper()->IsInTab() &&
+ m_rThis.GetUpper()->FindTabFrm()->IsFwdMoveAllowed() ) ) &&
+ 0 != const_cast<SwFrm&>(m_rThis).GetNextCellLeaf( MAKEPAGE_NONE ) )
{
bNoFwd = false;
}
< at >< at > -1966,7 +1967,7 < at >< at > sal_Bool SwFlowFrm::MoveFwd( sal_Bool bMakePage, sal_Bool bPageBreak, sal_Bool b
if ( !bPageBreak )
return sal_False;
- const SwFrm *pCol = rThis.FindColFrm();
+ const SwFrm *pCol = m_rThis.FindColFrm();
if ( !pCol || !pCol->GetPrev() )
return sal_False;
}
< at >< at > -1974,11 +1975,11 < at >< at > sal_Bool SwFlowFrm::MoveFwd( sal_Bool bMakePage, sal_Bool bPageBreak, sal_Bool b
sal_Bool bSamePage = sal_True;
SwLayoutFrm *pNewUpper =
- rThis.GetLeaf( bMakePage ? MAKEPAGE_INSERT : MAKEPAGE_NONE, sal_True );
+ m_rThis.GetLeaf( bMakePage ? MAKEPAGE_INSERT : MAKEPAGE_NONE, sal_True );
if ( pNewUpper )
{
- PROTOCOL_ENTER( &rThis, PROT_MOVE_FWD, 0, 0 );
+ PROTOCOL_ENTER( &m_rThis, PROT_MOVE_FWD, 0, 0 );
SwPageFrm *pOldPage = pOldBoss->FindPageFrm();
// We move ourself and all the direct successors before the
// first CntntFrm below the new Upper.
< at >< at > -1991,7 +1992,7 < at >< at > sal_Bool SwFlowFrm::MoveFwd( sal_Bool bMakePage, sal_Bool bPageBreak, sal_Bool b
// If we only switch column within our SectionFrm, we better don't
// call Calc, as this would format the SectionFrm, which in turn would
// call us again, etc.
- if( pSect != rThis.FindSctFrm() )
+ if( pSect != m_rThis.FindSctFrm() )
{
bool bUnlock = !pSect->IsColLocked();
pSect->ColLock();
< at >< at > -2032,9 +2033,9 < at >< at > sal_Bool SwFlowFrm::MoveFwd( sal_Bool bMakePage, sal_Bool bPageBreak, sal_Bool b
SWRECTFN( pOldBoss )
SwSaveFtnHeight aHeight( pOldBoss,
(pOldBoss->Frm().*fnRect->fnGetBottom)() );
- SwCntntFrm* pStart = rThis.IsCntntFrm() ?
- (SwCntntFrm*)&rThis : ((SwLayoutFrm&)rThis).ContainsCntnt();
- OSL_ENSURE( pStart || ( rThis.IsTabFrm() && !((SwTabFrm&)rThis).Lower() ),
+ SwCntntFrm* pStart = m_rThis.IsCntntFrm() ?
+ (SwCntntFrm*)&m_rThis : ((SwLayoutFrm&)m_rThis).ContainsCntnt();
+ OSL_ENSURE( pStart || ( m_rThis.IsTabFrm() && !((SwTabFrm&)m_rThis).Lower() ),
"MoveFwd: Missing Content" );
SwLayoutFrm* pBody = pStart ? ( pStart->IsTxtFrm() ?
(SwLayoutFrm*)((SwTxtFrm*)pStart)->FindBodyFrm() : 0 ) : 0;
< at >< at > -2046,13 +2047,13 < at >< at > sal_Bool SwFlowFrm::MoveFwd( sal_Bool bMakePage, sal_Bool bPageBreak, sal_Bool b
// by pNewUpper->Calc(), for instance into the pNewUpper.
// MoveSubTree or PasteTree respectively is not prepared to handle such a
// situation.
- if( pNewUpper != rThis.GetUpper() )
+ if( pNewUpper != m_rThis.GetUpper() )
{
// #i27145#
SwSectionFrm* pOldSct = 0;
- if ( rThis.GetUpper()->IsSctFrm() )
+ if ( m_rThis.GetUpper()->IsSctFrm() )
{
- pOldSct = static_cast<SwSectionFrm*>(rThis.GetUpper());
+ pOldSct = static_cast<SwSectionFrm*>(m_rThis.GetUpper());
}
MoveSubTree( pNewUpper, pNewUpper->Lower() );
< at >< at > -2086,10 +2087,10 < at >< at > sal_Bool SwFlowFrm::MoveFwd( sal_Bool bMakePage, sal_Bool bPageBreak, sal_Bool b
if( bBossChg )
{
- rThis.Prepare( PREP_BOSS_CHGD, 0, sal_False );
+ m_rThis.Prepare( PREP_BOSS_CHGD, 0, sal_False );
if( !bSamePage )
{
- ViewShell *pSh = rThis.getRootFrm()->GetCurrShell();
+ ViewShell *pSh = m_rThis.getRootFrm()->GetCurrShell();
if ( pSh && !pSh->Imp()->IsUpdateExpFlds() )
pSh->GetDoc()->SetNewFldLst(true); // Will be done by CalcLayout() later on!
< at >< at > -2101,14 +2102,14 < at >< at > sal_Bool SwFlowFrm::MoveFwd( sal_Bool bMakePage, sal_Bool bPageBreak, sal_Bool b
}
}
// OD 30.10.2002 #97265# - no <CheckPageDesc(..)> in online layout
- const ViewShell *pSh = rThis.getRootFrm()->GetCurrShell();
+ const ViewShell *pSh = m_rThis.getRootFrm()->GetCurrShell();
if ( !( pSh && pSh->GetViewOptions()->getBrowseMode() ) )
{
// #i106452#
// check page description not only in situation with sections.
if ( !bSamePage &&
- ( rThis.GetAttrSet()->GetPageDesc().GetPageDesc() ||
+ ( m_rThis.GetAttrSet()->GetPageDesc().GetPageDesc() ||
pOldPage->GetPageDesc()->GetFollow() != pNewPage->GetPageDesc() ) )
{
SwFrm::CheckPageDescs( pNewPage, sal_False );
< at >< at > -2133,15 +2134,15 < at >< at > sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat )
{
SwFlowFrm::SetMoveBwdJump( sal_False );
- SwFtnFrm* pFtn = rThis.FindFtnFrm();
+ SwFtnFrm* pFtn = m_rThis.FindFtnFrm();
if ( pFtn && pFtn->IsBackMoveLocked() )
return sal_False;
// #115759# - text frames, which are directly inside
// tables aren't allowed to move backward.
- if ( rThis.IsTxtFrm() && rThis.IsInTab() )
+ if ( m_rThis.IsTxtFrm() && m_rThis.IsInTab() )
{
- const SwLayoutFrm* pUpperFrm = rThis.GetUpper();
+ const SwLayoutFrm* pUpperFrm = m_rThis.GetUpper();
while ( pUpperFrm )
{
if ( pUpperFrm->IsTabFrm() )
< at >< at > -2156,7 +2157,7 < at >< at > sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat )
}
}
- SwFtnBossFrm * pOldBoss = rThis.FindFtnBossFrm();
+ SwFtnBossFrm * pOldBoss = m_rThis.FindFtnBossFrm();
SwPageFrm * const pOldPage = pOldBoss->FindPageFrm();
SwLayoutFrm *pNewUpper = 0;
bool bCheckPageDescs = false;
< at >< at > -2190,7 +2191,7 < at >< at > sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat )
( !bEndnote ||
pRefBoss->IsBefore( pOldBoss ) )
)
- pNewUpper = rThis.GetLeaf( MAKEPAGE_FTN, sal_False );
+ pNewUpper = m_rThis.GetLeaf( MAKEPAGE_FTN, sal_False );
}
else if ( IsPageBreak( sal_True ) ) // Do we have to respect a PageBreak?
{
< at >< at > -2198,7 +2199,7 < at >< at > sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat )
// flowing back makes sense despite the PageBreak (otherwise,
// we'd get an empty page).
// Of course we need to overlook empty pages!
- const SwFrm *pFlow = &rThis;
+ const SwFrm *pFlow = &m_rThis;
do
{
pFlow = pFlow->FindPrev();
< at >< at > -2214,7 +2215,7 < at >< at > sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat )
nDiff -= 1;
if ( nDiff > 1 )
{
- pNewUpper = rThis.GetLeaf( MAKEPAGE_NONE, sal_False );
+ pNewUpper = m_rThis.GetLeaf( MAKEPAGE_NONE, sal_False );
// #i53139#
// Now <pNewUpper> is a previous layout frame, which contains
// content. But the new upper layout frame has to be the next one.
< at >< at > -2241,13 +2242,13 < at >< at > sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat )
{
SwLayoutFrm* pNewNextUpper = pNewUpper->GetLeaf( MAKEPAGE_NONE, sal_True );
if ( pNewNextUpper &&
- pNewNextUpper != rThis.GetUpper() &&
+ pNewNextUpper != m_rThis.GetUpper() &&
pNewNextUpper->GetType() == pNewUpper->GetType() &&
pNewNextUpper->IsInDocBody() == pNewUpper->IsInDocBody() &&
pNewNextUpper->IsInFtn() == pNewUpper->IsInFtn() &&
pNewNextUpper->IsInTab() == pNewUpper->IsInTab() &&
pNewNextUpper->IsInSct() == pNewUpper->IsInSct() &&
- !rThis.WrongPageDesc( pNewNextUpper->FindPageFrm() ) )
+ !m_rThis.WrongPageDesc( pNewNextUpper->FindPageFrm() ) )
{
pNewUpper = pNewNextUpper;
bCheckPageDescOfNextPage = true;
< at >< at > -2264,9 +2265,9 < at >< at > sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat )
// If the previous column doesn't contain a CntntFrm, flowing back
// makes sense despite the ColumnBreak, as otherwise we'd get
// an empty column.
- if( rThis.IsInSct() )
+ if( m_rThis.IsInSct() )
{
- pNewUpper = rThis.GetLeaf( MAKEPAGE_NONE, sal_False );
+ pNewUpper = m_rThis.GetLeaf( MAKEPAGE_NONE, sal_False );
if( pNewUpper && !SwFlowFrm::IsMoveBwdJump() &&
( pNewUpper->ContainsCntnt() ||
( ( !pNewUpper->IsColBodyFrm() ||
< at >< at > -2297,7 +2298,7 < at >< at > sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat )
pNewNextUpper->IsInFtn() == pNewUpper->IsInFtn() &&
pNewNextUpper->IsInTab() == pNewUpper->IsInTab() &&
pNewNextUpper->IsInSct() == pNewUpper->IsInSct() &&
- !rThis.WrongPageDesc( pNewNextUpper->FindPageFrm() ) )
+ !m_rThis.WrongPageDesc( pNewNextUpper->FindPageFrm() ) )
{
pNewUpper = pNewNextUpper;
}
< at >< at > -2305,7 +2306,7 < at >< at > sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat )
}
else
{
- const SwFrm *pCol = rThis.FindColFrm();
+ const SwFrm *pCol = m_rThis.FindColFrm();
bool bGoOn = true;
bool bJump = false;
do
< at >< at > -2315,7 +2316,7 < at >< at > sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat )
else
{
bGoOn = false;
- pCol = rThis.GetLeaf( MAKEPAGE_NONE, sal_False );
+ pCol = m_rThis.GetLeaf( MAKEPAGE_NONE, sal_False );
}
if ( pCol )
{
< at >< at > -2346,13 +2347,13 < at >< at > sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat )
// frame isn't the current one.
SwLayoutFrm* pNewNextUpper = pNewUpper->GetLeaf( MAKEPAGE_NONE, sal_True );
if ( pNewNextUpper &&
- pNewNextUpper != rThis.GetUpper() &&
+ pNewNextUpper != m_rThis.GetUpper() &&
pNewNextUpper->GetType() == pNewUpper->GetType() &&
pNewNextUpper->IsInDocBody() == pNewUpper->IsInDocBody() &&
pNewNextUpper->IsInFtn() == pNewUpper->IsInFtn() &&
pNewNextUpper->IsInTab() == pNewUpper->IsInTab() &&
pNewNextUpper->IsInSct() == pNewUpper->IsInSct() &&
- !rThis.WrongPageDesc( pNewNextUpper->FindPageFrm() ) )
+ !m_rThis.WrongPageDesc( pNewNextUpper->FindPageFrm() ) )
{
pNewUpper = pNewNextUpper;
}
< at >< at > -2372,7 +2373,7 < at >< at > sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat )
}
}
else // No breaks - we can flow back.
- pNewUpper = rThis.GetLeaf( MAKEPAGE_NONE, sal_False );
+ pNewUpper = m_rThis.GetLeaf( MAKEPAGE_NONE, sal_False );
// #i27801# - no move backward of 'master' text frame,
// if - due to its object positioning - it isn't allowed to be on the new page frame
< at >< at > -2383,12 +2384,12 < at >< at > sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat )
// - allow move backward as long as the anchored object is only temporarily
// positions considering its wrapping style.
if ( pNewUpper &&
- rThis.IsTxtFrm() && !IsFollow() )
+ m_rThis.IsTxtFrm() && !IsFollow() )
{
sal_uInt32 nToPageNum( 0L );
const bool bMoveFwdByObjPos = SwLayouter::FrmMovedFwdByObjPos(
*(pOldPage->GetFmt()->GetDoc()),
- static_cast<SwTxtFrm&>(rThis),
+ static_cast<SwTxtFrm&>(m_rThis),
nToPageNum );
if ( bMoveFwdByObjPos &&
pNewUpper->FindPageFrm()->GetPhyPageNum() < nToPageNum )
< at >< at > -2397,12 +2398,12 < at >< at > sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat )
}
// #i44049# - check, if one of its anchored objects
// has restarted the layout process.
- else if ( rThis.GetDrawObjs() )
+ else if ( m_rThis.GetDrawObjs() )
{
sal_uInt32 i = 0;
- for ( ; i < rThis.GetDrawObjs()->Count(); ++i )
+ for ( ; i < m_rThis.GetDrawObjs()->Count(); ++i )
{
- SwAnchoredObject* pAnchoredObj = (*rThis.GetDrawObjs())[i];
+ SwAnchoredObject* pAnchoredObj = (*m_rThis.GetDrawObjs())[i];
// #i47697# - refine condition - see above
if ( pAnchoredObj->RestartLayoutProcess() &&
!pAnchoredObj->IsTmpConsiderWrapInfluence() )
< at >< at > -2448,7 +2449,7 < at >< at > sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat )
while ( pFrm->GetNext() )
pFrm = pFrm->GetNext();
pNewUpper = pFrm->GetLeaf( MAKEPAGE_INSERT, sal_True );
- if( pNewUpper == rThis.GetUpper() ) // Did we end up in the same place?
+ if( pNewUpper == m_rThis.GetUpper() ) // Did we end up in the same place?
pNewUpper = NULL; // If so, moving is not needed.
}
else
< at >< at > -2474,7 +2475,7 < at >< at > sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat )
{
pSectFrm->DelEmpty( sal_True );
delete pSectFrm;
- rThis.mbValidPos = sal_True;
+ m_rThis.mbValidPos = sal_True;
}
}
}
< at >< at > -2486,9 +2487,9 < at >< at > sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat )
// #i38232# - If next frame is a table, do *not* check,
// if it's locked.
if ( pNewUpper && !IsFollow() &&
- rThis.GetAttrSet()->GetKeep().GetValue() && rThis.GetIndNext() )
+ m_rThis.GetAttrSet()->GetKeep().GetValue() && m_rThis.GetIndNext() )
{
- SwFrm* pIndNext = rThis.GetIndNext();
+ SwFrm* pIndNext = m_rThis.GetIndNext();
// #i38232#
if ( !pIndNext->IsTabFrm() )
{
< at >< at > -2520,35 +2521,35 < at >< at > sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat )
// layout loop control for flowing content again and again moving
// backward under the same layout condition.
if ( pNewUpper && !IsFollow() &&
- pNewUpper != rThis.GetUpper() &&
+ pNewUpper != m_rThis.GetUpper() &&
SwLayouter::MoveBwdSuppressed( *(pOldPage->GetFmt()->GetDoc()),
*this, *pNewUpper ) )
{
SwLayoutFrm* pNextNewUpper = pNewUpper->GetLeaf(
- ( !rThis.IsSctFrm() && rThis.IsInSct() )
+ ( !m_rThis.IsSctFrm() && m_rThis.IsInSct() )
? MAKEPAGE_NOSECTION
: MAKEPAGE_NONE,
sal_True );
// #i73194# - make code robust
OSL_ENSURE( pNextNewUpper, "<SwFlowFrm::MoveBwd(..)> - missing next new upper" );
if ( pNextNewUpper &&
- ( pNextNewUpper == rThis.GetUpper() ||
- pNextNewUpper->GetType() != rThis.GetUpper()->GetType() ) )
+ ( pNextNewUpper == m_rThis.GetUpper() ||
+ pNextNewUpper->GetType() != m_rThis.GetUpper()->GetType() ) )
{
pNewUpper = 0L;
OSL_FAIL( "<SwFlowFrm::MoveBwd(..)> - layout loop control for layout action <Move Backward> applied!" );
}
}
- OSL_ENSURE( pNewUpper != rThis.GetUpper(),
+ OSL_ENSURE( pNewUpper != m_rThis.GetUpper(),
"<SwFlowFrm::MoveBwd(..)> - moving backward to the current upper frame!? -> Please inform OD." );
if ( pNewUpper )
{
- PROTOCOL_ENTER( &rThis, PROT_MOVE_BWD, 0, 0 );
+ PROTOCOL_ENTER( &m_rThis, PROT_MOVE_BWD, 0, 0 );
if ( pNewUpper->IsFtnContFrm() )
{
//Kann sein, dass ich einen Container bekam.
- SwFtnFrm *pOld = rThis.FindFtnFrm();
+ SwFtnFrm *pOld = m_rThis.FindFtnFrm();
SwFtnFrm *pNew = new SwFtnFrm( pOld->GetFmt(), pOld,
pOld->GetRef(), pOld->GetAttr() );
if ( pOld->GetMaster() )
< at >< at > -2561,9 +2562,9 < at >< at > sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat )
pNew->Paste( pNewUpper );
pNewUpper = pNew;
}
- if( pNewUpper->IsFtnFrm() && rThis.IsInSct() )
+ if( pNewUpper->IsFtnFrm() && m_rThis.IsInSct() )
{
- SwSectionFrm* pSct = rThis.FindSctFrm();
+ SwSectionFrm* pSct = m_rThis.FindSctFrm();
// If we're in a section of a footnote, we may need to create
// a SwSectionFrm in the new upper
if( pSct->IsInFtn() )
< at >< at > -2601,7 +2602,7 < at >< at > sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat )
bFollow = pSect->HasFollow();
}
pNewUpper->Calc();
- rThis.Cut();
+ m_rThis.Cut();
//
// optimization: format section, if its size is invalidated and if it's
// the new parent of moved backward frame.
< at >< at > -2618,16 +2619,16 < at >< at > sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat )
}
}
- rThis.Paste( pNewUpper );
+ m_rThis.Paste( pNewUpper );
// - optimization
if ( bFormatSect )
pSect->Calc();
- SwPageFrm *pNewPage = rThis.FindPageFrm();
+ SwPageFrm *pNewPage = m_rThis.FindPageFrm();
if( pNewPage != pOldPage )
{
- rThis.Prepare( PREP_BOSS_CHGD, (const void*)pOldPage, sal_False );
- ViewShell *pSh = rThis.getRootFrm()->GetCurrShell();
+ m_rThis.Prepare( PREP_BOSS_CHGD, (const void*)pOldPage, sal_False );
+ ViewShell *pSh = m_rThis.getRootFrm()->GetCurrShell();
if ( pSh && !pSh->Imp()->IsUpdateExpFlds() )
pSh->GetDoc()->SetNewFldLst(true); // Will be done by CalcLayout() later on
< at >< at > -2646,7 +2647,7 < at >< at > sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat )
(SwPageFrm*)pNewPage->GetNext();
SwFrm::CheckPageDescs( pStartPage, sal_False);
}
- else if ( rThis.GetAttrSet()->GetPageDesc().GetPageDesc() )
+ else if ( m_rThis.GetAttrSet()->GetPageDesc().GetPageDesc() )
{
// First page could get empty for example by disabling
// a section
diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx
index 9722b23..c4894bd 100644
--- a/sw/source/core/layout/sectfrm.cxx
+++ b/sw/source/core/layout/sectfrm.cxx
< at >< at > -2619,11 +2619,11 < at >< at > void SwSectionFrm::InvalidateFtnPos()
long SwSectionFrm::Undersize( sal_Bool bOverSize )
{
- bUndersized = sal_False;
+ m_bUndersized = sal_False;
SWRECTFN( this )
long nRet = InnerHeight() - (Prt().*fnRect->fnGetHeight)();
if( nRet > 0 )
- bUndersized = sal_True;
+ m_bUndersized = sal_True;
else if( !bOverSize )
nRet = 0;
return nRet;
</pre>
Miklos Vajna
2013-05-25T17:56:03
-
core.git: Repository.mk solenv/bin
http://comments.gmane.org/gmane.comp.documentfoundation.libreoffice.scm/27744
<pre> Repository.mk | 1 -
solenv/bin/gsicheck | 13 -------------
2 files changed, 14 deletions(-)
New commits:
commit 7a3ddcc0a6e7693fba14f227f3d8615c9bbfe022
Author: Andras Timar <atimar< at >suse.com>
Date: Sat May 25 18:18:31 2013 +0200
gsicheck is no more
Change-Id: I4b70690073247ebb9dde35370630b568568821d3
diff --git a/Repository.mk b/Repository.mk
index c6a779d..723d7a3 100644
--- a/Repository.mk
+++ b/Repository.mk
< at >< at > -39,7 +39,6 < at >< at > $(eval $(call gb_Helper_register_executables,NONE, \
genconv_dict \
gendict \
genindex_data \
- gsicheck \
helpex \
idxdict \
langsupport \
diff --git a/solenv/bin/gsicheck b/solenv/bin/gsicheck
deleted file mode 100755
index 5a09880..0000000
--- a/solenv/bin/gsicheck
+++ /dev/null
< at >< at > -1,13 +0,0 < at >< at >
-#!/bin/sh
-if [ x${SOLARENV}x = xx ]; then
- echo No environment found, please use 'setsolar'
-exit 1
-fi
-
-if [ "${OS?}" = MACOSX ]; then
- export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH:+${DYLD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib
-else
- export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib
-fi
-
-exec $SOLARVERSION/$INPATH/bin/gsicheck "$< at >"
</pre>
Andras Timar
2013-05-25T16:19:01
-
core.git: Branch 'libreoffice-4-1' -cui/uiconfig dbaccess/uiconfig svx/uiconfig sw/uiconfigxmlsecurity/uiconfig
http://comments.gmane.org/gmane.comp.documentfoundation.libreoffice.scm/27743
<pre> cui/uiconfig/ui/backgroundpage.ui | 2 +-
cui/uiconfig/ui/optadvancedpage.ui | 2 +-
cui/uiconfig/ui/optpathspage.ui | 2 +-
dbaccess/uiconfig/ui/generalpagewizard.ui | 2 +-
dbaccess/uiconfig/ui/querypropertiesdialog.ui | 4 ++--
svx/uiconfig/ui/headfootformatpage.ui | 2 +-
sw/uiconfig/swriter/ui/editsectiondialog.ui | 2 +-
xmlsecurity/uiconfig/ui/securitytrustpage.ui | 2 +-
8 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 2f5a4b914daac00c8881ca69783c879d074fed9d
Author: Andras Timar <atimar< at >suse.com>
Date: Sat May 25 17:26:49 2013 +0200
translatable="yes" for some elements in .ui files
Conflicts:
starmath/uiconfig/smath/ui/alignmentdialog.ui
starmath/uiconfig/smath/ui/spacingdialog.ui
Change-Id: I915cd6e73f907850f17b102c7860a827b91eef37
diff --git a/cui/uiconfig/ui/backgroundpage.ui b/cui/uiconfig/ui/backgroundpage.ui
index 5fcb803..68a550a 100644
--- a/cui/uiconfig/ui/backgroundpage.ui
+++ b/cui/uiconfig/ui/backgroundpage.ui
< at >< at > -293,7 +293,7 < at >< at >
<property name="no_show_all">True</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
- <property name="label">&lt;FILENAME&gt;</property>
+ <property name="label" translatable="yes">&lt;FILENAME&gt;</property>
</object>
<packing>
<property name="left_attach">0</property>
diff --git a/cui/uiconfig/ui/optadvancedpage.ui b/cui/uiconfig/ui/optadvancedpage.ui
index 1c54497..cb23222 100644
--- a/cui/uiconfig/ui/optadvancedpage.ui
+++ b/cui/uiconfig/ui/optadvancedpage.ui
< at >< at > -93,7 +93,7 < at >< at >
<property name="layout_style">start</property>
<child>
<object class="GtkButton" id="add">
- <property name="label">_Add...</property>
+ <property name="label" translatable="yes">_Add...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
diff --git a/cui/uiconfig/ui/optpathspage.ui b/cui/uiconfig/ui/optpathspage.ui
index 64f0b80..a273f7b 100644
--- a/cui/uiconfig/ui/optpathspage.ui
+++ b/cui/uiconfig/ui/optpathspage.ui
< at >< at > -148,7 +148,7 < at >< at >
</child>
<child>
<object class="GtkButton" id="edit">
- <property name="label">_Edit...</property>
+ <property name="label" translatable="yes">_Edit...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
diff --git a/dbaccess/uiconfig/ui/generalpagewizard.ui b/dbaccess/uiconfig/ui/generalpagewizard.ui
index 95025e7..0e41080 100644
--- a/dbaccess/uiconfig/ui/generalpagewizard.ui
+++ b/dbaccess/uiconfig/ui/generalpagewizard.ui
< at >< at > -136,7 +136,7 < at >< at >
</child>
<child>
<object class="dbulo-OpenDocumentButton" id="openDatabase">
- <property name="label">Open</property>
+ <property name="label" translatable="yes">Open</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
diff --git a/dbaccess/uiconfig/ui/querypropertiesdialog.ui b/dbaccess/uiconfig/ui/querypropertiesdialog.ui
index 6f55af2..ddd5936 100644
--- a/dbaccess/uiconfig/ui/querypropertiesdialog.ui
+++ b/dbaccess/uiconfig/ui/querypropertiesdialog.ui
< at >< at > -118,7 +118,7 < at >< at >
<property name="layout_style">start</property>
<child>
<object class="GtkRadioButton" id="distinct">
- <property name="label">Yes</property>
+ <property name="label" translatable="yes">Yes</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
< at >< at > -134,7 +134,7 < at >< at >
</child>
<child>
<object class="GtkRadioButton" id="nondistinct">
- <property name="label">No</property>
+ <property name="label" translatable="yes">No</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
diff --git a/svx/uiconfig/ui/headfootformatpage.ui b/svx/uiconfig/ui/headfootformatpage.ui
index 8fe9008..c77abad 100644
--- a/svx/uiconfig/ui/headfootformatpage.ui
+++ b/svx/uiconfig/ui/headfootformatpage.ui
< at >< at > -336,7 +336,7 < at >< at >
</child>
<child>
<object class="GtkButton" id="buttonEdit">
- <property name="label">_Edit...</property>
+ <property name="label" translatable="yes">_Edit...</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
diff --git a/sw/uiconfig/swriter/ui/editsectiondialog.ui b/sw/uiconfig/swriter/ui/editsectiondialog.ui
index 96cc9a9..54a751d 100644
--- a/sw/uiconfig/swriter/ui/editsectiondialog.ui
+++ b/sw/uiconfig/swriter/ui/editsectiondialog.ui
< at >< at > -49,7 +49,7 < at >< at >
</child>
<child>
<object class="GtkButton" id="options">
- <property name="label">_Options...</property>
+ <property name="label" translatable="yes">_Options...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
diff --git a/xmlsecurity/uiconfig/ui/securitytrustpage.ui b/xmlsecurity/uiconfig/ui/securitytrustpage.ui
index 4ffa7d3..5727880 100644
--- a/xmlsecurity/uiconfig/ui/securitytrustpage.ui
+++ b/xmlsecurity/uiconfig/ui/securitytrustpage.ui
< at >< at > -231,7 +231,7 < at >< at >
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="addfile">
- <property name="label">A_dd...</property>
+ <property name="label" translatable="yes">A_dd...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
</pre>
Andras Timar
2013-05-25T15:29:38
-
core.git: cui/uiconfig dbaccess/uiconfigstarmath/uiconfig svx/uiconfig sw/uiconfig xmlsecurity/uiconfig
http://comments.gmane.org/gmane.comp.documentfoundation.libreoffice.scm/27742
<pre> cui/uiconfig/ui/backgroundpage.ui | 2 +-
cui/uiconfig/ui/optadvancedpage.ui | 2 +-
cui/uiconfig/ui/optpathspage.ui | 2 +-
dbaccess/uiconfig/ui/generalpagewizard.ui | 2 +-
dbaccess/uiconfig/ui/querypropertiesdialog.ui | 4 ++--
starmath/uiconfig/smath/ui/alignmentdialog.ui | 2 +-
starmath/uiconfig/smath/ui/spacingdialog.ui | 2 +-
svx/uiconfig/ui/headfootformatpage.ui | 2 +-
sw/uiconfig/swriter/ui/editsectiondialog.ui | 2 +-
xmlsecurity/uiconfig/ui/securitytrustpage.ui | 2 +-
10 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit 05eaada40d22ca02cebd1392e44beabcdd8d3964
Author: Andras Timar <atimar< at >suse.com>
Date: Sat May 25 17:26:49 2013 +0200
translatable="yes" for some elements in .ui files
Change-Id: I915cd6e73f907850f17b102c7860a827b91eef37
diff --git a/cui/uiconfig/ui/backgroundpage.ui b/cui/uiconfig/ui/backgroundpage.ui
index 5fcb803..68a550a 100644
--- a/cui/uiconfig/ui/backgroundpage.ui
+++ b/cui/uiconfig/ui/backgroundpage.ui
< at >< at > -293,7 +293,7 < at >< at >
<property name="no_show_all">True</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
- <property name="label">&lt;FILENAME&gt;</property>
+ <property name="label" translatable="yes">&lt;FILENAME&gt;</property>
</object>
<packing>
<property name="left_attach">0</property>
diff --git a/cui/uiconfig/ui/optadvancedpage.ui b/cui/uiconfig/ui/optadvancedpage.ui
index 02415e4..5d703d3 100644
--- a/cui/uiconfig/ui/optadvancedpage.ui
+++ b/cui/uiconfig/ui/optadvancedpage.ui
< at >< at > -93,7 +93,7 < at >< at >
<property name="layout_style">start</property>
<child>
<object class="GtkButton" id="add">
- <property name="label">_Add...</property>
+ <property name="label" translatable="yes">_Add...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
diff --git a/cui/uiconfig/ui/optpathspage.ui b/cui/uiconfig/ui/optpathspage.ui
index 64f0b80..a273f7b 100644
--- a/cui/uiconfig/ui/optpathspage.ui
+++ b/cui/uiconfig/ui/optpathspage.ui
< at >< at > -148,7 +148,7 < at >< at >
</child>
<child>
<object class="GtkButton" id="edit">
- <property name="label">_Edit...</property>
+ <property name="label" translatable="yes">_Edit...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
diff --git a/dbaccess/uiconfig/ui/generalpagewizard.ui b/dbaccess/uiconfig/ui/generalpagewizard.ui
index 95025e7..0e41080 100644
--- a/dbaccess/uiconfig/ui/generalpagewizard.ui
+++ b/dbaccess/uiconfig/ui/generalpagewizard.ui
< at >< at > -136,7 +136,7 < at >< at >
</child>
<child>
<object class="dbulo-OpenDocumentButton" id="openDatabase">
- <property name="label">Open</property>
+ <property name="label" translatable="yes">Open</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
diff --git a/dbaccess/uiconfig/ui/querypropertiesdialog.ui b/dbaccess/uiconfig/ui/querypropertiesdialog.ui
index 6f55af2..ddd5936 100644
--- a/dbaccess/uiconfig/ui/querypropertiesdialog.ui
+++ b/dbaccess/uiconfig/ui/querypropertiesdialog.ui
< at >< at > -118,7 +118,7 < at >< at >
<property name="layout_style">start</property>
<child>
<object class="GtkRadioButton" id="distinct">
- <property name="label">Yes</property>
+ <property name="label" translatable="yes">Yes</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
< at >< at > -134,7 +134,7 < at >< at >
</child>
<child>
<object class="GtkRadioButton" id="nondistinct">
- <property name="label">No</property>
+ <property name="label" translatable="yes">No</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
diff --git a/starmath/uiconfig/smath/ui/alignmentdialog.ui b/starmath/uiconfig/smath/ui/alignmentdialog.ui
index 25ae7dc..7368f21 100644
--- a/starmath/uiconfig/smath/ui/alignmentdialog.ui
+++ b/starmath/uiconfig/smath/ui/alignmentdialog.ui
< at >< at > -61,7 +61,7 < at >< at >
</child>
<child>
<object class="GtkButton" id="default">
- <property name="label">_Default</property>
+ <property name="label" translatable="yes">_Default</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
diff --git a/starmath/uiconfig/smath/ui/spacingdialog.ui b/starmath/uiconfig/smath/ui/spacingdialog.ui
index 17c569a..a0dd15d 100644
--- a/starmath/uiconfig/smath/ui/spacingdialog.ui
+++ b/starmath/uiconfig/smath/ui/spacingdialog.ui
< at >< at > -332,7 +332,7 < at >< at >
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label">Title</property>
+ <property name="label" translatable="yes">Title</property>
<property name="use_underline">True</property>
<attributes>
<attribute name="weight" value="bold"/>
diff --git a/svx/uiconfig/ui/headfootformatpage.ui b/svx/uiconfig/ui/headfootformatpage.ui
index 8fe9008..c77abad 100644
--- a/svx/uiconfig/ui/headfootformatpage.ui
+++ b/svx/uiconfig/ui/headfootformatpage.ui
< at >< at > -336,7 +336,7 < at >< at >
</child>
<child>
<object class="GtkButton" id="buttonEdit">
- <property name="label">_Edit...</property>
+ <property name="label" translatable="yes">_Edit...</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
diff --git a/sw/uiconfig/swriter/ui/editsectiondialog.ui b/sw/uiconfig/swriter/ui/editsectiondialog.ui
index 96cc9a9..54a751d 100644
--- a/sw/uiconfig/swriter/ui/editsectiondialog.ui
+++ b/sw/uiconfig/swriter/ui/editsectiondialog.ui
< at >< at > -49,7 +49,7 < at >< at >
</child>
<child>
<object class="GtkButton" id="options">
- <property name="label">_Options...</property>
+ <property name="label" translatable="yes">_Options...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
diff --git a/xmlsecurity/uiconfig/ui/securitytrustpage.ui b/xmlsecurity/uiconfig/ui/securitytrustpage.ui
index 4ffa7d3..5727880 100644
--- a/xmlsecurity/uiconfig/ui/securitytrustpage.ui
+++ b/xmlsecurity/uiconfig/ui/securitytrustpage.ui
< at >< at > -231,7 +231,7 < at >< at >
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="addfile">
- <property name="label">A_dd...</property>
+ <property name="label" translatable="yes">A_dd...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
</pre>
Andras Timar
2013-05-25T15:27:48
-
core.git: freetype/ExternalProject_freetype.mk
http://comments.gmane.org/gmane.comp.documentfoundation.libreoffice.scm/27741
<pre> freetype/ExternalProject_freetype.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3f42e3196f3b574afbf7d0df022dd68271cab0dc
Author: David Tardon <dtardon< at >redhat.com>
Date: Sat May 25 13:02:30 2013 +0200
blind attempt to unbreak android build
Change-Id: I633568f2bfd2af6b14f8bcc192cd2fcc32521131
diff --git a/freetype/ExternalProject_freetype.mk b/freetype/ExternalProject_freetype.mk
index 8e2108c..ba22a64 100644
--- a/freetype/ExternalProject_freetype.mk
+++ b/freetype/ExternalProject_freetype.mk
< at >< at > -20,7 +20,7 < at >< at > $(call gb_ExternalProject_get_state_target,freetype,build) :
--disable-shared \
--without-zlib \
--without-bzip2 \
---prefix=$(OUTDIR) --includedir=$(OUTDIR)/inc/external \
+--prefix=$(OUTDIR) --includedir=$(call gb_UnpackedTarball_get_dir,freetype)/include \
--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
&& chmod +x builds/unix/freetype-config \
&& $(MAKE) \
</pre>
David Tardon
2013-05-25T15:08:01
Search Engine
Search the mailing list at Gmane
query
http://search.gmane.org/?group=$group=gmane.comp.documentfoundation.libreoffice.scm