diff options
-rw-r--r-- | framework/inc/helper/titlehelper.hxx | 1 | ||||
-rw-r--r-- | framework/inc/properties.h | 17 | ||||
-rw-r--r-- | framework/source/helper/titlebarupdate.cxx | 2 | ||||
-rw-r--r-- | framework/source/helper/titlehelper.cxx | 27 | ||||
-rw-r--r-- | framework/source/services/tabwindowservice.cxx | 2 |
5 files changed, 2 insertions, 47 deletions
diff --git a/framework/inc/helper/titlehelper.hxx b/framework/inc/helper/titlehelper.hxx index a816b4299539..5042f73e11f9 100644 --- a/framework/inc/helper/titlehelper.hxx +++ b/framework/inc/helper/titlehelper.hxx @@ -181,7 +181,6 @@ class TitleHelper : private ::cppu::BaseMutex void impl_appendProductExtension (::rtl::OUStringBuffer& sTitle); void impl_appendModuleName (::rtl::OUStringBuffer& sTitle); void impl_appendDebugVersion (::rtl::OUStringBuffer& sTitle); - void impl_appendEvalVersion (::rtl::OUStringBuffer& sTitle); void impl_setSubTitle (const css::uno::Reference< css::frame::XTitle >& xSubTitle); ::rtl::OUString impl_getSubTitle (); diff --git a/framework/inc/properties.h b/framework/inc/properties.h index 5a32a42a28cc..ddf08a5cf578 100644 --- a/framework/inc/properties.h +++ b/framework/inc/properties.h @@ -271,27 +271,10 @@ namespace framework{ #define TABWINDOW_PROPHANDLE_TOPWINDOW 1 #define TABWINDOW_PROPCOUNT 2 -//_______________________________________________ -/** properties for tab window service (new) */ -#define TABWINDOWSERVICE_PROPNAME_ASCII_WINDOW "Window" -#define TABWINDOWSERVICE_PROPNAME_WINDOW ::rtl::OUString::createFromAscii( TABWINDOWSERVICE_PROPNAME_ASCII_WINDOW ) - #define TABWINDOWSERVICE_PROPHANDLE_WINDOW 0 #define TABWINDOWSERVICE_PROPCOUNT 1 //_______________________________________________ -/** properties of tabreg service */ -static const char* TABREG_PROPNAME_ASCII_TITLE = "title"; - -static const ::rtl::OUString TABREG_PROPNAME_TITLE = ::rtl::OUString::createFromAscii(TABREG_PROPNAME_ASCII_TITLE); - -//_______________________________________________ -/** properties of controller service */ -static const char* CONTROLLER_PROPNAME_ASCII_ICONID = "IconId"; - -static const ::rtl::OUString CONTROLLER_PROPNAME_ICONID = ::rtl::OUString::createFromAscii(CONTROLLER_PROPNAME_ASCII_ICONID); - -//_______________________________________________ /** provides some helper methods to implement property sets. */ class PropHelper diff --git a/framework/source/helper/titlebarupdate.cxx b/framework/source/helper/titlebarupdate.cxx index eaa4cf31db1d..fd2154f6f359 100644 --- a/framework/source/helper/titlebarupdate.cxx +++ b/framework/source/helper/titlebarupdate.cxx @@ -285,7 +285,7 @@ void TitleBarUpdate::impl_updateIcon(const css::uno::Reference< css::frame::XFra { try { - xSet->getPropertyValue( CONTROLLER_PROPNAME_ICONID ) >>= nIcon; + xSet->getPropertyValue( DECLARE_ASCII("IconId") ) >>= nIcon; } catch(const css::uno::Exception&) {} diff --git a/framework/source/helper/titlehelper.cxx b/framework/source/helper/titlehelper.cxx index bc29005b8cd0..e85648383a8e 100644 --- a/framework/source/helper/titlehelper.cxx +++ b/framework/source/helper/titlehelper.cxx @@ -512,7 +512,6 @@ void TitleHelper::impl_updateTitleForFrame (const css::uno::Reference< css::fram impl_appendProductName (sTitle); impl_appendModuleName (sTitle); impl_appendProductExtension (sTitle); - //impl_appendEvalVersion (sTitle); impl_appendDebugVersion (sTitle); // SYNCHRONIZED -> @@ -623,32 +622,6 @@ void TitleHelper::impl_appendDebugVersion (::rtl::OUStringBuffer&) } #endif -//***************************************************************************************************************** -void TitleHelper::impl_appendEvalVersion (::rtl::OUStringBuffer& /*sTitle*/) -{ - // SYNCHRONIZED -> - // ::osl::ResettableMutexGuard aLock(m_aMutex); - // css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = m_xSMGR ; - //aLock.clear (); - //// <- SYNCHRONIZED - - //css::uno::Reference< css::beans::XMaterialHolder > xHolder( - // xSMGR->createInstance(SERVICENAME_TABREG), - // css::uno::UNO_QUERY); - - // if ( ! xHolder.is()) - // return; - - // ::comphelper::SequenceAsHashMap aMaterial(xHolder->getMaterial()); - //const ::rtl::OUString sEvalTitle = aMaterial.getUnpackedValueOrDefault(TABREG_PROPNAME_TITLE, ::rtl::OUString()); - - //if (sEvalTitle.getLength()) - //{ - // sTitle.appendAscii (" " ); - // sTitle.append (sEvalTitle); - //} -} - //----------------------------------------------- void TitleHelper::impl_startListeningForModel (const css::uno::Reference< css::frame::XModel >& xModel) { diff --git a/framework/source/services/tabwindowservice.cxx b/framework/source/services/tabwindowservice.cxx index be4895879237..5a0c45fc9a48 100644 --- a/framework/source/services/tabwindowservice.cxx +++ b/framework/source/services/tabwindowservice.cxx @@ -323,7 +323,7 @@ void TabWindowService::impl_initializePropInfo() impl_addPropertyInfo( css::beans::Property( - TABWINDOWSERVICE_PROPNAME_WINDOW, + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Window")), TABWINDOWSERVICE_PROPHANDLE_WINDOW, ::getCppuType((const css::uno::Reference< css::awt::XWindow >*)NULL), css::beans::PropertyAttribute::TRANSIENT)); |