summaryrefslogtreecommitdiff
path: root/framework/source/uiconfiguration
diff options
context:
space:
mode:
authorXisco Fauli <anistenis@gmail.com>2011-03-29 22:09:35 +0200
committerChristina Rossmanith <ChrRossmanith@web.de>2011-03-29 22:10:18 +0200
commit1c9e7d47bef1aeb53cb74a8b24cff33ab5fbc692 (patch)
tree4a51efe48b8563e5f8f7934a64e85a8aa8094464 /framework/source/uiconfiguration
parent151837450c0bb64ea9e1738d2d3086d823aebd77 (diff)
Remove commented code in libs-core/framework
Diffstat (limited to 'framework/source/uiconfiguration')
-rwxr-xr-xframework/source/uiconfiguration/globalsettings.cxx2
-rwxr-xr-xframework/source/uiconfiguration/moduleuiconfigurationmanager.cxx1
-rwxr-xr-xframework/source/uiconfiguration/uicategorydescription.cxx2
-rwxr-xr-xframework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx15
-rwxr-xr-xframework/source/uiconfiguration/windowstateconfiguration.cxx4
5 files changed, 6 insertions, 18 deletions
diff --git a/framework/source/uiconfiguration/globalsettings.cxx b/framework/source/uiconfiguration/globalsettings.cxx
index a7974f6ed082..f246cb9365a0 100755
--- a/framework/source/uiconfiguration/globalsettings.cxx
+++ b/framework/source/uiconfiguration/globalsettings.cxx
@@ -58,7 +58,6 @@
//_________________________________________________________________________________________________________________
// Defines
//_________________________________________________________________________________________________________________
-//
using namespace ::com::sun::star;
@@ -67,7 +66,6 @@ using ::rtl::OUString;
//_________________________________________________________________________________________________________________
// Namespace
//_________________________________________________________________________________________________________________
-//
static const char GLOBALSETTINGS_ROOT_ACCESS[] = "/org.openoffice.Office.UI.GlobalSettings/Toolbars";
diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
index 88c377e7a35e..61086f56db68 100755
--- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
@@ -297,7 +297,6 @@ void ModuleUIConfigurationManager::impl_preloadUIElementTypeList( Layer eLayer,
}
}
- //rElementTypeData.bLoaded = true;
}
void ModuleUIConfigurationManager::impl_requestUIElementData( sal_Int16 nElementType, Layer eLayer, UIElementData& aUIElementData )
diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx
index 49d415b7655f..1a04cf285ab1 100755
--- a/framework/source/uiconfiguration/uicategorydescription.cxx
+++ b/framework/source/uiconfiguration/uicategorydescription.cxx
@@ -65,7 +65,6 @@
//_________________________________________________________________________________________________________________
// Defines
//_________________________________________________________________________________________________________________
-//
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
@@ -76,7 +75,6 @@ using namespace ::com::sun::star::frame;
//_________________________________________________________________________________________________________________
// Namespace
//_________________________________________________________________________________________________________________
-//
struct ModuleToCategory
{
diff --git a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx
index 2b24b3931e0e..46f919d37678 100755
--- a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx
@@ -1357,7 +1357,6 @@ Reference< XInterface > UIConfigurationManagerImpl::getImageManager() throw (::c
return Reference< XInterface >( m_xModuleImageManager, UNO_QUERY );
-// return Reference< XInterface >();
}
Reference< XInterface > UIConfigurationManagerImpl::getShortCutManager() throw (::com::sun::star::uno::RuntimeException)
@@ -1454,14 +1453,12 @@ void UIConfigurationManagerImpl::setStorage( const Reference< XStorage >& Storag
else if ( i == ::com::sun::star::ui::UIElementType::STATUSBAR )
aResourceType = PresetHandler::RESOURCETYPE_STATUSBAR();
- //if ( aResourceType.getLength() > 0 )
- {
- m_pStorageHandler[i] = new PresetHandler( m_xServiceManager );
- m_pStorageHandler[i]->connectToResource( PresetHandler::E_DOCUMENT,
- rtl::OUString::createFromAscii( UIELEMENTTYPENAMES[i] ), // this path wont be used later ... seee next lines!
- sEmpty,
- m_xUserConfigStorage);
- }
+
+ m_pStorageHandler[i] = new PresetHandler( m_xServiceManager );
+ m_pStorageHandler[i]->connectToResource( PresetHandler::E_DOCUMENT,
+ rtl::OUString::createFromAscii( UIELEMENTTYPENAMES[i] ), // this path wont be used later ... see next lines!
+ sEmpty,
+ m_xUserConfigStorage);
}
Reference< XPropertySet > xPropSet( m_xUserConfigStorage, UNO_QUERY );
if ( xPropSet.is() )
diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx
index ad03a45dfcb9..4366700eb890 100755
--- a/framework/source/uiconfiguration/windowstateconfiguration.cxx
+++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx
@@ -61,7 +61,6 @@
//_________________________________________________________________________________________________________________
// Defines
//_________________________________________________________________________________________________________________
-//
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
@@ -74,7 +73,6 @@ using namespace ::com::sun::star::ui;
//_________________________________________________________________________________________________________________
// Namespace
//_________________________________________________________________________________________________________________
-//
static const char CONFIGURATION_ROOT_ACCESS[] = "/org.openoffice.Office.UI.";
static const char CONFIGURATION_WINDOWSTATE_ACCESS[] = "/UIElements/States";
@@ -589,12 +587,10 @@ void SAL_CALL ConfigurationAccess_WindowState::elementInserted( const ContainerE
void SAL_CALL ConfigurationAccess_WindowState::elementRemoved ( const ContainerEvent& ) throw(RuntimeException)
{
- //
}
void SAL_CALL ConfigurationAccess_WindowState::elementReplaced( const ContainerEvent& ) throw(RuntimeException)
{
- //
}
// lang.XEventListener