cui/source/dialogs/scriptdlg.cxx | 10 +++---- cui/source/factory/dlgfact.cxx | 46 ++++++++++++++++---------------- cui/source/factory/dlgfact.hxx | 8 ++--- cui/source/inc/scriptdlg.hxx | 6 ++-- cui/source/tabpages/border.cxx | 2 - jvmfwk/source/framework.cxx | 50 ++++++++++++++++++++++++++++++----- sd/source/filter/cgm/sdcgmfilter.cxx | 20 ++++---------- 7 files changed, 86 insertions(+), 56 deletions(-)
New commits: commit 6544c1921aa11c5e7eac98d609d5f26e705e6bd3 Author: Tor Lillqvist <[email protected]> Date: Mon Oct 8 11:40:09 2012 +0300 Deduplicate lcl_mediumColor Change-Id: I11556fc7dc2013ce66627e8ab41c91d0742d6866 diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index e51a492..bfa722a 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -1020,7 +1020,7 @@ void SvxBorderTabPage::FillValueSets() } // ============================================================================ -Color lcl_mediumColor( Color aMain, Color /*aDefault*/ ) +static Color lcl_mediumColor( Color aMain, Color /*aDefault*/ ) { return SvxBorderLine::threeDMediumColor( aMain ); } commit b69bfbf1f32156769dd1a0ce6125118172389f95 Author: Tor Lillqvist <[email protected]> Date: Mon Oct 8 11:35:37 2012 +0300 Deduplication of AbstractTabDialog_Impl and VclAbstractDialog_Impl Change-Id: Ifda222d842312d084496bc17d3ae6eaf83c13d25 diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index e65d314..0af0745 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -110,9 +110,9 @@ 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(VclAbstractDialog_Impl) +IMPL_ABSTDLG_BASE(CuiVclAbstractDialog_Impl) IMPL_ABSTDLG_BASE(VclAbstractRefreshableDialog_Impl); -IMPL_ABSTDLG_BASE(AbstractTabDialog_Impl); +IMPL_ABSTDLG_BASE(CuiAbstractTabDialog_Impl); IMPL_ABSTDLG_BASE(AbstractSvxDistributeDialog_Impl); IMPL_ABSTDLG_BASE(AbstractHangulHanjaConversionDialog_Impl); IMPL_ABSTDLG_BASE(AbstractFmShowColsDialog_Impl); @@ -200,31 +200,31 @@ IMPL_LINK( VclAbstractDialog2_Impl, EndDialogHdl, Dialog*, pDlg ) ////////////////////////////////////////////////////////////////////////// -void AbstractTabDialog_Impl::SetCurPageId( sal_uInt16 nId ) +void CuiAbstractTabDialog_Impl::SetCurPageId( sal_uInt16 nId ) { pDlg->SetCurPageId( nId ); } -const SfxItemSet* AbstractTabDialog_Impl::GetOutputItemSet() const +const SfxItemSet* CuiAbstractTabDialog_Impl::GetOutputItemSet() const { return pDlg->GetOutputItemSet(); } -const sal_uInt16* AbstractTabDialog_Impl::GetInputRanges(const SfxItemPool& pItem ) +const sal_uInt16* CuiAbstractTabDialog_Impl::GetInputRanges(const SfxItemPool& pItem ) { return pDlg->GetInputRanges( pItem ); } -void AbstractTabDialog_Impl::SetInputSet( const SfxItemSet* pInSet ) +void CuiAbstractTabDialog_Impl::SetInputSet( const SfxItemSet* pInSet ) { pDlg->SetInputSet( pInSet ); } //From class Window. -void AbstractTabDialog_Impl::SetText( const XubString& rStr ) +void CuiAbstractTabDialog_Impl::SetText( const XubString& rStr ) { pDlg->SetText( rStr ); } -String AbstractTabDialog_Impl::GetText() const +String CuiAbstractTabDialog_Impl::GetText() const { return pDlg->GetText(); } @@ -1026,7 +1026,7 @@ VclAbstractDialog* AbstractDialogFactory_Impl::CreateVclDialog( Window* pParent, } if ( pDlg ) - return new VclAbstractDialog_Impl( pDlg ); + return new CuiVclAbstractDialog_Impl( pDlg ); return 0; } @@ -1054,7 +1054,7 @@ VclAbstractDialog* AbstractDialogFactory_Impl::CreateFrameDialog( } if ( pDlg ) - return new VclAbstractDialog_Impl( pDlg ); + return new CuiVclAbstractDialog_Impl( pDlg ); else return NULL; } @@ -1081,7 +1081,7 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTabDialog( sal_uInt32 nR } if ( pDlg ) - return new AbstractTabDialog_Impl( pDlg ); + return new CuiAbstractTabDialog_Impl( pDlg ); return 0; } @@ -1110,7 +1110,7 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTabDialog( sal_uInt32 nR } if ( pDlg ) - return new AbstractTabDialog_Impl( pDlg ); + return new CuiAbstractTabDialog_Impl( pDlg ); return 0; } @@ -1121,7 +1121,7 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTextTabDialog( Window* p SdrModel* ) { SfxTabDialog* pDlg = new SvxTextTabDialog( pParent, pAttrSet, pView ); - return new AbstractTabDialog_Impl( pDlg ); + return new CuiAbstractTabDialog_Impl( pDlg ); } // TabDialog that use functionality of the drawing layer and add AnchorTypes -- for SvxCaptionTabDialog @@ -1250,7 +1250,7 @@ VclAbstractDialog * AbstractDialogFactory_Impl::CreateSvxScriptOrgDialog( Window pDlg = new SvxScriptOrgDialog( pParent, rLanguage); if ( pDlg ) - return new VclAbstractDialog_Impl( pDlg ); + return new CuiVclAbstractDialog_Impl( pDlg ); return 0; } @@ -1337,7 +1337,7 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTabItemDialog( Window* p } if ( pDlg ) - return new AbstractTabDialog_Impl( pDlg ); + return new CuiAbstractTabDialog_Impl( pDlg ); return 0; } @@ -1346,7 +1346,7 @@ VclAbstractDialog* AbstractDialogFactory_Impl::CreateSvxSearchAttributeDial const sal_uInt16* pWhRanges ) { Dialog* pDlg = new SvxSearchAttributeDialog( pParent, rLst, pWhRanges); - return new VclAbstractDialog_Impl( pDlg ); + return new CuiVclAbstractDialog_Impl( pDlg ); } AbstractSvxSearchSimilarityDialog * AbstractDialogFactory_Impl::CreateSvxSearchSimilarityDialog( Window* pParent, @@ -1366,7 +1366,7 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSvxBorderBackgroundDlg( sal_Bool bEnableSelector) { SfxTabDialog* pDlg = new SvxBorderBackgroundDlg( pParent, rCoreSet, bEnableSelector); - return new AbstractTabDialog_Impl( pDlg ); + return new CuiAbstractTabDialog_Impl( pDlg ); } AbstractSvxTransformTabDialog* AbstractDialogFactory_Impl::CreateSvxTransformTabDialog( Window* pParent, @@ -1406,7 +1406,7 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSchTransformTabDialog( W } if ( pDlg ) - return new AbstractTabDialog_Impl( pDlg ); + return new CuiAbstractTabDialog_Impl( pDlg ); return 0; } @@ -1459,7 +1459,7 @@ VclAbstractDialog* AbstractDialogFactory_Impl::CreateSvxEditDictionaryDialo } if ( pDlg ) - return new VclAbstractDialog_Impl( pDlg ); + return new CuiVclAbstractDialog_Impl( pDlg ); return 0; } @@ -1622,7 +1622,7 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSvxLineTabDialog( Window sal_Bool bHasObj) { SfxTabDialog* pDlg = new SvxLineTabDialog( pParent, pAttr, pModel,pObj,bHasObj ); - return new AbstractTabDialog_Impl( pDlg ); + return new CuiAbstractTabDialog_Impl( pDlg ); } SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( Window* pParent, @@ -1909,7 +1909,7 @@ VclAbstractDialog* AbstractDialogFactory_Impl::CreateEditObjectDialog( Window* p { pDlg = new SfxInsertFloatingFrameDialog( pParent, xObj ); pDlg->SetHelpId( rtl::OUStringToOString( rCommand, RTL_TEXTENCODING_UTF8 ) ); - return new VclAbstractDialog_Impl( pDlg ); + return new CuiVclAbstractDialog_Impl( pDlg ); } return 0; } @@ -1931,7 +1931,7 @@ SfxAbstractLinksDialog* AbstractDialogFactory_Impl::CreateLinksDialog( Window* p SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSvxFormatCellsDialog( Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, const SdrObject* /*pObj*/ ) { - return new AbstractTabDialog_Impl( new SvxFormatCellsDialog( pParent, pAttr, pModel ) ); + return new CuiAbstractTabDialog_Impl( new SvxFormatCellsDialog( pParent, pAttr, pModel ) ); } SvxAbstractSplittTableDialog* AbstractDialogFactory_Impl::CreateSvxSplittTableDialog( Window* pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal ) @@ -1947,7 +1947,7 @@ SvxAbstractNewTableDialog* AbstractDialogFactory_Impl::CreateSvxNewTableDialog( VclAbstractDialog* AbstractDialogFactory_Impl::CreateOptionsDialog( Window* pParent, const rtl::OUString& rExtensionId, const rtl::OUString& /*rApplicationContext*/ ) { - return new VclAbstractDialog_Impl( new OfaTreeOptionsDialog( pParent, rExtensionId ) ); + return new CuiVclAbstractDialog_Impl( new OfaTreeOptionsDialog( pParent, rExtensionId ) ); } SvxAbstractInsRowColDlg* AbstractDialogFactory_Impl::CreateSvxInsRowColDlg( Window* pParent, bool bCol, const rtl::OString& sHelpId ) diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index c1a99fc..232e0d1 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -104,9 +104,9 @@ private: }; //for GalleryThemeProperties end -class VclAbstractDialog_Impl : public VclAbstractDialog +class CuiVclAbstractDialog_Impl : public VclAbstractDialog { - DECL_ABSTDLG_BASE(VclAbstractDialog_Impl,Dialog) + DECL_ABSTDLG_BASE(CuiVclAbstractDialog_Impl,Dialog) }; //for ActualizeProgress begin @@ -128,9 +128,9 @@ class AbstractSfxDialog_Impl : public SfxAbstractDialog virtual String GetText() const ; }; -class AbstractTabDialog_Impl : public SfxAbstractTabDialog +class CuiAbstractTabDialog_Impl : public SfxAbstractTabDialog { - DECL_ABSTDLG_BASE(AbstractTabDialog_Impl,SfxTabDialog) + DECL_ABSTDLG_BASE(CuiAbstractTabDialog_Impl,SfxTabDialog) virtual void SetCurPageId( sal_uInt16 nId ); virtual const SfxItemSet* GetOutputItemSet() const; virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ); commit 179ba0a1f725693e37abc4c0127445aaf8e57247 Author: Tor Lillqvist <[email protected]> Date: Mon Oct 8 11:20:56 2012 +0300 Deduplicate InputDialog (for disable-dynloading) Change-Id: Id1522e1874ed2b65f7bd8d379b93c35941a7d0b5 diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index 2c7b154..8a01b1f 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -441,9 +441,9 @@ void SFTreeListBox::ExpandedHdl() } // ---------------------------------------------------------------------------- -// InputDialog ------------------------------------------------------------ +// CuiInputDialog ------------------------------------------------------------ // ---------------------------------------------------------------------------- -InputDialog::InputDialog(Window * pParent, sal_uInt16 nMode ) +CuiInputDialog::CuiInputDialog(Window * pParent, sal_uInt16 nMode ) : ModalDialog( pParent, CUI_RES( RID_DLG_NEWLIB ) ), aText( this, CUI_RES( FT_NEWLIB ) ), aEdit( this, CUI_RES( ED_LIBNAME ) ), @@ -498,7 +498,7 @@ InputDialog::InputDialog(Window * pParent, sal_uInt16 nMode ) } -InputDialog::~InputDialog() +CuiInputDialog::~CuiInputDialog() { } // ---------------------------------------------------------------------------- @@ -947,7 +947,7 @@ void SvxScriptOrgDialog::createEntry( SvLBoxEntry* pEntry ) } SAL_WNODEPRECATED_DECLARATIONS_PUSH - std::auto_ptr< InputDialog > xNewDlg( new InputDialog( static_cast<Window*>(this), nMode ) ); + std::auto_ptr< CuiInputDialog > xNewDlg( new CuiInputDialog( static_cast<Window*>(this), nMode ) ); SAL_WNODEPRECATED_DECLARATIONS_POP xNewDlg->SetObjectName( aNewName ); @@ -1079,7 +1079,7 @@ void SvxScriptOrgDialog::renameEntry( SvLBoxEntry* pEntry ) sal_uInt16 nMode = INPUTMODE_RENAME; SAL_WNODEPRECATED_DECLARATIONS_PUSH - std::auto_ptr< InputDialog > xNewDlg( new InputDialog( static_cast<Window*>(this), nMode ) ); + std::auto_ptr< CuiInputDialog > xNewDlg( new CuiInputDialog( static_cast<Window*>(this), nMode ) ); SAL_WNODEPRECATED_DECLARATIONS_POP xNewDlg->SetObjectName( aNewName ); diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx index c347063..0fd8ee1 100644 --- a/cui/source/inc/scriptdlg.hxx +++ b/cui/source/inc/scriptdlg.hxx @@ -107,7 +107,7 @@ public: void deleteAllTree( ); }; -class InputDialog : public ModalDialog +class CuiInputDialog : public ModalDialog { private: FixedText aText; @@ -116,8 +116,8 @@ private: CancelButton aCancelButton; public: - InputDialog( Window * pParent, sal_uInt16 nMode ); - ~InputDialog(); + CuiInputDialog( Window * pParent, sal_uInt16 nMode ); + ~CuiInputDialog(); String GetObjectName() const { return aEdit.GetText(); } void SetObjectName( const String& rName ) { aEdit.SetText( rName ); aEdit.SetSelection( Selection( 0, rName.Len() ) );} commit 2f40a3318e3e14c76d77db874792f05dc172545a Author: Tor Lillqvist <[email protected]> Date: Mon Oct 8 11:04:57 2012 +0300 Fix for !SOLAR_JAVA Change-Id: I43d8680304ef11f2b5f5e3edafcc6af6eca8d601 diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx index e75b11f..ae40729 100644 --- a/jvmfwk/source/framework.cxx +++ b/jvmfwk/source/framework.cxx @@ -42,15 +42,20 @@ #define UNO_JAVA_JFW_JREHOME "UNO_JAVA_JFW_JREHOME" namespace { -JavaVM * g_pJavaVM = NULL; -bool g_bEnabledSwitchedOn = false; +static bool g_bEnabledSwitchedOn = false; + +#ifdef SOLAAR_JAVA + +static JavaVM * g_pJavaVM = NULL; sal_Bool areEqualJavaInfo( JavaInfo const * pInfoA,JavaInfo const * pInfoB) { return jfw_areEqualJavaInfo(pInfoA, pInfoB); } + +#endif } #ifdef DISABLE_DYNLOADING @@ -90,6 +95,12 @@ javaPluginError jfw_plugin_existJRE(const JavaInfo *pInfo, sal_Bool *exist); javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSize) { +#ifndef SOLAR_JAVA + (void) pparInfo; + (void) pSize; + + return JFW_E_JAVA_DISABLED; +#else javaFrameworkError retVal = JFW_E_NONE; try { @@ -182,13 +193,13 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSi jfw_plugin_getJavaInfoByPath_ptr jfw_plugin_getJavaInfoByPathFunc = (jfw_plugin_getJavaInfoByPath_ptr) pluginLib.getFunctionSymbol( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("jfw_plugin_getJavaInfoByPath"))); + OSL_ASSERT(jfw_plugin_getJavaInfoByPathFunc); + if (jfw_plugin_getJavaInfoByPathFunc == NULL) + return JFW_E_ERROR; #else jfw_plugin_getJavaInfoByPath_ptr jfw_plugin_getJavaInfoByPathFunc = jfw_plugin_getJavaInfoByPath; #endif - OSL_ASSERT(jfw_plugin_getJavaInfoByPathFunc); - if (jfw_plugin_getJavaInfoByPathFunc == NULL) - return JFW_E_ERROR; typedef std::vector<rtl::OUString>::const_iterator citLoc; //Check every manually added location @@ -276,6 +287,7 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSi OSL_FAIL(e.message.getStr()); } return retVal; +#endif } javaFrameworkError SAL_CALL jfw_startVM(JavaVMOption *arOptions, sal_Int32 cOptions, @@ -287,7 +299,7 @@ javaFrameworkError SAL_CALL jfw_startVM(JavaVMOption *arOptions, sal_Int32 cOpti (void) ppVM; (void) ppEnv; - return JFW_E_ERROR; + return JFW_E_JAVA_DISABLED; #else javaFrameworkError errcode = JFW_E_NONE; if (cOptions > 0 && arOptions == NULL) @@ -477,6 +489,11 @@ javaFrameworkError SAL_CALL jfw_startVM(JavaVMOption *arOptions, sal_Int32 cOpti */ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo) { +#ifndef SOLAR_JAVA + (void) pInfo; + + return JFW_E_JAVA_DISABLED; +#else javaFrameworkError errcode = JFW_E_NONE; try { @@ -682,7 +699,9 @@ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo) } return errcode; +#endif } + sal_Bool SAL_CALL jfw_areEqualJavaInfo( JavaInfo const * pInfoA,JavaInfo const * pInfoB) { @@ -774,6 +793,10 @@ javaFrameworkError SAL_CALL jfw_getSelectedJRE(JavaInfo **ppInfo) javaFrameworkError SAL_CALL jfw_isVMRunning(sal_Bool *bRunning) { +#ifndef SOLAR_JAVA + (void) bRunning; + return JFW_E_JAVA_DISABLED; +#else osl::MutexGuard guard(jfw::FwkMutex::get()); if (bRunning == NULL) return JFW_E_INVALID_ARG; @@ -782,11 +805,18 @@ javaFrameworkError SAL_CALL jfw_isVMRunning(sal_Bool *bRunning) else *bRunning = sal_True; return JFW_E_NONE; +#endif } javaFrameworkError SAL_CALL jfw_getJavaInfoByPath( rtl_uString *pPath, JavaInfo **ppInfo) { +#ifndef SOLAR_JAVA + (void) pPath; + (void) ppInfo; + + return JFW_E_JAVA_DISABLED; +#else javaFrameworkError errcode = JFW_E_NONE; try { @@ -905,6 +935,7 @@ javaFrameworkError SAL_CALL jfw_getJavaInfoByPath( } return errcode; +#endif } @@ -1170,6 +1201,12 @@ javaFrameworkError SAL_CALL jfw_getJRELocations( javaFrameworkError jfw_existJRE(const JavaInfo *pInfo, sal_Bool *exist) { +#ifndef SOLAR_JAVA + (void) pInfo; + (void) exist; + + return JFW_E_JAVA_DISABLED; +#else //get the function jfw_plugin_existJRE jfw::VendorSettings aVendorSettings; jfw::CJavaInfo aInfo; @@ -1208,6 +1245,7 @@ javaFrameworkError jfw_existJRE(const JavaInfo *pInfo, sal_Bool *exist) ret = JFW_E_ERROR; } return ret; +#endif } void SAL_CALL jfw_lock() commit 7b71e4ca5d9a5e979179b24f39b761040c608a8c Author: Tor Lillqvist <[email protected]> Date: Mon Oct 8 11:40:45 2012 +0300 There is no ExportCGM Change-Id: I1251c25e14636fea96aba08f90dfe3d16978a270 diff --git a/sd/source/filter/cgm/sdcgmfilter.cxx b/sd/source/filter/cgm/sdcgmfilter.cxx index 7135ee8..b33b4ce 100644 --- a/sd/source/filter/cgm/sdcgmfilter.cxx +++ b/sd/source/filter/cgm/sdcgmfilter.cxx @@ -73,7 +73,6 @@ typedef sal_Bool ( __LOADONCALLAPI *ExportCGMPointer )( ::rtl::OUString&, Refere #ifdef DISABLE_DYNLOADING extern "C" sal_uInt32 ImportCGM( ::rtl::OUString&, Reference< XModel >&, sal_uInt32, Reference< XStatusIndicator >& ); -extern "C" sal_Bool ExportCGM( ::rtl::OUString&, Reference< XModel >&, Reference< XStatusIndicator >&, void* ); #endif @@ -150,22 +149,16 @@ sal_Bool SdCGMFilter::Import() sal_Bool SdCGMFilter::Export() { -#ifndef DISABLE_DYNLOADING +#ifdef DISABLE_DYNLOADING + // No ExportCGM function exists(!) + return sal_False; +#else ::osl::Module* pLibrary = OpenLibrary( mrMedium.GetFilter()->GetUserData() ); -#endif sal_Bool bRet = sal_False; - if( -#ifndef DISABLE_DYNLOADING - pLibrary && -#endif - mxModel.is() ) + if( pLibrary && mxModel.is() ) { -#ifndef DISABLE_DYNLOADING ExportCGMPointer FncCGMExport = reinterpret_cast< ExportCGM >( pLibrary->getFunctionSymbol( "ExportCGM" ) ); -#else - ExportCGMPointer FncCGMExport = ExportCGM; -#endif if( FncCGMExport ) { @@ -176,10 +169,9 @@ sal_Bool SdCGMFilter::Export() } } -#ifndef DISABLE_DYNLOADING delete pLibrary; -#endif return bRet; +#endif } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
