configure.in | 2 +- cppuhelper/source/shlib.cxx | 4 ---- cui/source/factory/dlgfact.cxx | 14 +++++++------- cui/source/factory/dlgfact.hxx | 4 ++-- sd/source/ui/dlg/sddlgfact.cxx | 10 +++++----- sd/source/ui/dlg/sddlgfact.hxx | 4 ++-- sw/source/ui/dialog/swdialmgr.cxx | 6 ++++-- sw/source/ui/dialog/swdlgfact.cxx | 16 ++++++++-------- sw/source/ui/dialog/swdlgfact.hxx | 4 ++-- sw/source/ui/frmdlg/frmpage.cxx | 12 ++++++------ 10 files changed, 37 insertions(+), 39 deletions(-)
New commits: commit f5ba1a09408be65e6c5831c2b61bc94133d7ad13 Author: Tor Lillqvist <[email protected]> Date: Tue Oct 9 09:28:09 2012 +0300 De-duplicate aEmptyStr and pSwResMgr Change-Id: I129754d1180ea15d815b2b4d2533f911f10116c3 diff --git a/sw/source/ui/dialog/swdialmgr.cxx b/sw/source/ui/dialog/swdialmgr.cxx index d8fb185..364416d 100644 --- a/sw/source/ui/dialog/swdialmgr.cxx +++ b/sw/source/ui/dialog/swdialmgr.cxx @@ -30,13 +30,15 @@ #include "tools/string.hxx" #include <sfx2/app.hxx> +#ifndef DISABLE_DYNLOADING //copy from core\bastyp\swtypes.cxx String aEmptyStr; // constant strings - -ResMgr* pSwResMgr=0; +#endif ResMgr* SwDialogsResMgr::GetResMgr() { + static ResMgr* pSwResMgr=0; + if ( !pSwResMgr ) { pSwResMgr = SfxApplication::CreateResManager( "sw" ); commit fc6fa71e8512cbca511b6a8acbf0d6f439b32dde Author: Tor Lillqvist <[email protected]> Date: Tue Oct 9 09:27:32 2012 +0300 Make lcl functions static Change-Id: Ia8439fda69324a48660e6b6c5b954c6d3eb14bc9 diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 8396539..887709f 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -394,7 +394,7 @@ static sal_uInt16 aAddPgRg[] = { 0 }; -size_t lcl_GetFrmMapCount( const FrmMap* pMap) +static size_t lcl_GetFrmMapCount( const FrmMap* pMap) { if ( pMap ) { @@ -567,7 +567,7 @@ SvxSwFramePosString::StringId lcl_ChangeResIdToVerticalOrRTL(SvxSwFramePosString // helper method in order to determine all possible // listbox relations in a relation map for a given relation -sal_uLong lcl_GetLBRelationsForRelations( const sal_uInt16 _nRel ) +static sal_uLong lcl_GetLBRelationsForRelations( const sal_uInt16 _nRel ) { sal_uLong nLBRelations = 0L; @@ -585,9 +585,9 @@ sal_uLong lcl_GetLBRelationsForRelations( const sal_uInt16 _nRel ) // helper method on order to determine all possible // listbox relations in a relation map for a given string ID -sal_uLong lcl_GetLBRelationsForStrID( const FrmMap* _pMap, - const SvxSwFramePosString::StringId _eStrId, - const bool _bUseMirrorStr ) +static sal_uLong lcl_GetLBRelationsForStrID( const FrmMap* _pMap, + const SvxSwFramePosString::StringId _eStrId, + const bool _bUseMirrorStr ) { sal_uLong nLBRelations = 0L; @@ -2740,7 +2740,7 @@ IMPL_LINK_NOARG(SwFrmURLPage, InsertFileHdl) return 0; } -void lcl_Move(Window& rWin, sal_Int32 nDiff) +static void lcl_Move(Window& rWin, sal_Int32 nDiff) { Point aPos(rWin.GetPosPixel()); aPos.Y() -= nDiff; commit 3f00118cc911ca1175031fed2b6b8931a421c04c Author: Tor Lillqvist <[email protected]> Date: Tue Oct 9 09:25:16 2012 +0300 De-duplicate AbstractSfxDialog_Impl Change-Id: Iddf2222aa75b21dd60472fa8dc979ddbdc18dcba diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index a97e658..3c01929 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -100,7 +100,7 @@ using ::com::sun::star::uno::Reference; using namespace svx; // AbstractTabDialog implementations just forwards everything to the dialog -IMPL_ABSTDLG_BASE(AbstractSfxDialog_Impl) +IMPL_ABSTDLG_BASE(CuiAbstractSfxDialog_Impl) IMPL_ABSTDLG_BASE(CuiVclAbstractDialog_Impl) IMPL_ABSTDLG_BASE(VclAbstractRefreshableDialog_Impl); IMPL_ABSTDLG_BASE(CuiAbstractTabDialog_Impl); @@ -221,17 +221,17 @@ String CuiAbstractTabDialog_Impl::GetText() const } -const SfxItemSet* AbstractSfxDialog_Impl::GetOutputItemSet() const +const SfxItemSet* CuiAbstractSfxDialog_Impl::GetOutputItemSet() const { return pDlg->GetOutputItemSet(); } -void AbstractSfxDialog_Impl::SetText( const XubString& rStr ) +void CuiAbstractSfxDialog_Impl::SetText( const XubString& rStr ) { pDlg->SetText( rStr ); } -String AbstractSfxDialog_Impl::GetText() const +String CuiAbstractSfxDialog_Impl::GetText() const { return pDlg->GetText(); } @@ -1299,7 +1299,7 @@ SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( sal_uInt32, const SfxItemSet* pAttrSet ) { SfxModalDialog* pDlg = new SvxCharacterMap( pParent, sal_True, pAttrSet ); - return new AbstractSfxDialog_Impl( pDlg ); + return new CuiAbstractSfxDialog_Impl( pDlg ); } SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTabItemDialog( Window* pParent, @@ -1628,7 +1628,7 @@ SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( Window* pParent, } if ( pDlg ) - return new AbstractSfxDialog_Impl( pDlg ); + return new CuiAbstractSfxDialog_Impl( pDlg ); return 0; } @@ -1655,7 +1655,7 @@ SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( Window* pParent, } if ( pDlg ) - return new AbstractSfxDialog_Impl( pDlg ); + return new CuiAbstractSfxDialog_Impl( pDlg ); return 0; } diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index d90e809..d85f923 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -109,9 +109,9 @@ class VclAbstractRefreshableDialog_Impl : public VclAbstractRefreshableDialog }; //for ActualizeProgress end -class AbstractSfxDialog_Impl : public SfxAbstractDialog +class CuiAbstractSfxDialog_Impl : public SfxAbstractDialog { - DECL_ABSTDLG_BASE(AbstractSfxDialog_Impl,SfxModalDialog) + DECL_ABSTDLG_BASE(CuiAbstractSfxDialog_Impl,SfxModalDialog) virtual const SfxItemSet* GetOutputItemSet() const; //From class Window. diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx index dbff1fc..44c0c81 100644 --- a/sd/source/ui/dlg/sddlgfact.cxx +++ b/sd/source/ui/dlg/sddlgfact.cxx @@ -75,7 +75,7 @@ IMPL_ABSTDLG_BASE(AbstractSdInsertPagesObjsDlg_Impl); IMPL_ABSTDLG_BASE(AbstractMorphDlg_Impl); IMPL_ABSTDLG_BASE(AbstractSdStartPresDlg_Impl); IMPL_ABSTDLG_BASE(AbstractSdPresLayoutDlg_Impl); -IMPL_ABSTDLG_BASE(AbstractSfxDialog_Impl); +IMPL_ABSTDLG_BASE(SdAbstractSfxDialog_Impl); IMPL_ABSTDLG_BASE(AbstractSdVectorizeDlg_Impl); IMPL_ABSTDLG_BASE(AbstractSdPublishingDlg_Impl); IMPL_ABSTDLG_BASE(AbstractHeaderFooterDialog_Impl); @@ -332,15 +332,15 @@ void AbstractSdPresLayoutDlg_Impl::GetAttr( SfxItemSet& rOutAttrs ) // AbstractSdPresLayoutDlg_Impl end //SfxAbstractDialog_Impl begin -const SfxItemSet* AbstractSfxDialog_Impl::GetOutputItemSet() const +const SfxItemSet* SdAbstractSfxDialog_Impl::GetOutputItemSet() const { return pDlg->GetOutputItemSet(); } -void AbstractSfxDialog_Impl::SetText( const XubString& rStr ) +void SdAbstractSfxDialog_Impl::SetText( const XubString& rStr ) { pDlg->SetText( rStr ); } -String AbstractSfxDialog_Impl::GetText() const +String SdAbstractSfxDialog_Impl::GetText() const { return pDlg->GetText(); } @@ -520,7 +520,7 @@ SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdTabTemplateDlg( :: SfxAbstractDialog* SdAbstractDialogFactory_Impl::CreatSdActionDialog( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ) { - return new AbstractSfxDialog_Impl( new SdActionDlg( pParent, pAttr, pView ) ); + return new SdAbstractSfxDialog_Impl( new SdActionDlg( pParent, pAttr, pView ) ); } // add for SdVectorizeDlg begin diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx index 6970d71..e29d2d2 100644 --- a/sd/source/ui/dlg/sddlgfact.hxx +++ b/sd/source/ui/dlg/sddlgfact.hxx @@ -218,9 +218,9 @@ class AbstractSdPresLayoutDlg_Impl : public AbstractSdPresLayoutDlg }; // add for SdActionDlg -class AbstractSfxDialog_Impl : public SfxAbstractDialog +class SdAbstractSfxDialog_Impl : public SfxAbstractDialog { - DECL_ABSTDLG_BASE(AbstractSfxDialog_Impl,SfxModalDialog) + DECL_ABSTDLG_BASE(SdAbstractSfxDialog_Impl,SfxModalDialog) virtual const SfxItemSet* GetOutputItemSet() const; virtual void SetText( const XubString& rStr ); virtual String GetText() const; diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx index 131b707..09dbd3f 100644 --- a/sw/source/ui/dialog/swdlgfact.cxx +++ b/sw/source/ui/dialog/swdlgfact.cxx @@ -107,7 +107,7 @@ using namespace ::com::sun::star; IMPL_ABSTDLG_BASE(AbstractSwWordCountFloatDlg_Impl); IMPL_ABSTDLG_BASE(AbstractSwInsertAbstractDlg_Impl); -IMPL_ABSTDLG_BASE(AbstractSfxDialog_Impl); +IMPL_ABSTDLG_BASE(SwAbstractSfxDialog_Impl); IMPL_ABSTDLG_BASE(AbstractSwAsciiFilterDlg_Impl); IMPL_ABSTDLG_BASE(VclAbstractDialog_Impl); IMPL_ABSTDLG_BASE(AbstractSplitTableDialog_Impl); @@ -178,17 +178,17 @@ sal_uInt8 AbstractSwInsertAbstractDlg_Impl::GetPara() const } //add for SwAddrDlg, SwDropCapsDlg ,SwBackgroundDlg, SwNumFmtDlg SwBorderDlg SwWrapDlg SwFldEditDlg begin -const SfxItemSet* AbstractSfxDialog_Impl::GetOutputItemSet() const +const SfxItemSet* SwAbstractSfxDialog_Impl::GetOutputItemSet() const { return pDlg->GetOutputItemSet(); } -void AbstractSfxDialog_Impl::SetText( const XubString& rStr ) +void SwAbstractSfxDialog_Impl::SetText( const XubString& rStr ) { pDlg->SetText( rStr ); } -String AbstractSfxDialog_Impl::GetText() const +String SwAbstractSfxDialog_Impl::GetText() const { return pDlg->GetText(); } @@ -667,7 +667,7 @@ SfxAbstractDialog* SwAbstractDialogFactory_Impl::CreateSfxDialog( Window* pParen } if ( pDlg ) - return new AbstractSfxDialog_Impl( pDlg ); + return new SwAbstractSfxDialog_Impl( pDlg ); return 0; } @@ -980,7 +980,7 @@ SfxAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwBorderDlg (Window* pPa } if ( pDlg ) - return new AbstractSfxDialog_Impl( pDlg ); + return new SwAbstractSfxDialog_Impl( pDlg ); return 0; } @@ -997,7 +997,7 @@ SfxAbstractDialog* SwAbstractDialogFactory_Impl::CreateSwWrapDlg ( Window* pPare } if ( pDlg ) - return new AbstractSfxDialog_Impl( pDlg ); + return new SwAbstractSfxDialog_Impl( pDlg ); return 0; } @@ -1057,7 +1057,7 @@ SfxAbstractDialog* SwAbstractDialogFactory_Impl::CreateSwFldEditDlg ( SwView& } if ( pDlg ) - return new AbstractSfxDialog_Impl( pDlg ); + return new SwAbstractSfxDialog_Impl( pDlg ); return 0; } diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx index b94f61a..f176439 100644 --- a/sw/source/ui/dialog/swdlgfact.hxx +++ b/sw/source/ui/dialog/swdlgfact.hxx @@ -95,9 +95,9 @@ class AbstractSwInsertAbstractDlg_Impl : public AbstractSwInsertAbstractDlg // add for SwAddrDlg, SwDropCapsDlg, SwBackgroundDlg SwNumFmtDlg SwWrapDlg SwBorderDlg, SwFldEditDlg begin class SfxSingleTabDialog; -class AbstractSfxDialog_Impl :public SfxAbstractDialog +class SwAbstractSfxDialog_Impl :public SfxAbstractDialog { - DECL_ABSTDLG_BASE(AbstractSfxDialog_Impl,SfxModalDialog) + DECL_ABSTDLG_BASE(SwAbstractSfxDialog_Impl,SfxModalDialog) virtual const SfxItemSet* GetOutputItemSet() const; virtual void SetText( const XubString& rStr ); virtual String GetText() const; commit 3c4c11700899a1ee70d16444d960bd220d8e0b48 Author: Tor Lillqvist <[email protected]> Date: Tue Oct 9 09:23:52 2012 +0300 I want to see what unknown library is required always Change-Id: I7e0eb7ba3be8ac2b70e6a56d84c1a890be0ba396 diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx index ed140f0..bd92701 100644 --- a/cppuhelper/source/shlib.cxx +++ b/cppuhelper/source/shlib.cxx @@ -41,9 +41,7 @@ #include "com/sun/star/beans/XPropertySet.hpp" -#if OSL_DEBUG_LEVEL > 1 #include <stdio.h> -#endif #include <vector> #ifdef IOS @@ -570,9 +568,7 @@ Reference< XInterface > SAL_CALL loadSharedLibComponentFactory( } if ( pSym == NULL ) { -#if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "attempting to load unknown library %s\n", OUStringToOString( rLibName, RTL_TEXTENCODING_ASCII_US ).getStr() ); -#endif assert( !"Attempt to load unknown library" ); } } commit 835a0a97ab99d92b0c5f9762f585b4c837bcc0ba Author: Tor Lillqvist <[email protected]> Date: Tue Oct 9 09:03:04 2012 +0300 Do generate Thumb code, I think the current NDK (r8b) handles it fine Change-Id: If331d969f419d72076faff661bd0fbeb52bd24c4 diff --git a/configure.in b/configure.in index 8d1f904..4c55537 100644 --- a/configure.in +++ b/configure.in @@ -186,7 +186,7 @@ if test -n "$with_android_ndk"; then if test $host_cpu = arm; then ANDROID_APP_ABI=armeabi-v7a - ANDROIDCFLAGS="-march=armv7-a -mfloat-abi=softfp -mfpu=neon -Wl,--fix-cortex-a8" + ANDROIDCFLAGS="-march=armv7-a -mfloat-abi=softfp -mthumb -mfpu=neon -Wl,--fix-cortex-a8" elif test $host_cpu = mips; then ANDROID_APP_ABI=mips ANDROIDCFLAGS="" _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
