summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sfx2/source/appl/childwin.cxx1
-rw-r--r--sfx2/source/sidebar/SidebarChildWindow.cxx7
-rw-r--r--sfx2/source/sidebar/SidebarController.cxx78
-rw-r--r--unotools/source/config/viewoptions.cxx10
4 files changed, 5 insertions, 91 deletions
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx
index 1cf3fee279be..e6ce4e136d2c 100644
--- a/sfx2/source/appl/childwin.cxx
+++ b/sfx2/source/appl/childwin.cxx
@@ -387,7 +387,6 @@ void SfxChildWindow::InitializeChildWinFactory_Impl(sal_uInt16 nId, SfxChildWinI
OUString aWinData( aTmp );
rInfo.aWinState = OUStringToOString(xWinOpt->GetWindowState(), RTL_TEXTENCODING_UTF8);
-
if ( !aWinData.isEmpty() )
{
// Search for version ID
diff --git a/sfx2/source/sidebar/SidebarChildWindow.cxx b/sfx2/source/sidebar/SidebarChildWindow.cxx
index f6aa2fdf5222..addc0a98b3ca 100644
--- a/sfx2/source/sidebar/SidebarChildWindow.cxx
+++ b/sfx2/source/sidebar/SidebarChildWindow.cxx
@@ -26,13 +26,10 @@
#include <sfx2/dockwin.hxx>
#include <sfx2/sidebar/ResourceDefinitions.hrc>
-
namespace sfx2 { namespace sidebar {
-
SFX_IMPL_DOCKINGWINDOW_WITHID(SidebarChildWindow, SID_SIDEBAR);
-
SidebarChildWindow::SidebarChildWindow (
vcl::Window* pParentWindow,
sal_uInt16 nId,
@@ -58,9 +55,6 @@ SidebarChildWindow::SidebarChildWindow (
this->pWindow->Show();
}
-
-
-
sal_Int32 SidebarChildWindow::GetDefaultWidth (vcl::Window* pWindow)
{
if (pWindow != NULL)
@@ -75,7 +69,6 @@ sal_Int32 SidebarChildWindow::GetDefaultWidth (vcl::Window* pWindow)
return 0;
}
-
} } // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index db09eea970e8..478758704390 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -60,9 +60,6 @@ using namespace css;
using namespace css::uno;
using ::rtl::OUString;
-
-#undef VERBOSE
-
namespace
{
const static char gsReadOnlyCommandName[] = ".uno:EditDoc";
@@ -71,7 +68,6 @@ namespace
const static sal_Int32 gnWidthOpenThreshold (40);
}
-
namespace sfx2 { namespace sidebar {
SidebarController::SidebarControllerContainer SidebarController::maSidebarControllerContainer;
@@ -220,9 +216,6 @@ void SAL_CALL SidebarController::disposing (void)
maAsynchronousDeckSwitch.CancelRequest();
}
-
-
-
void SAL_CALL SidebarController::notifyContextChangeEvent (const css::ui::ContextChangeEventObject& rEvent)
throw(css::uno::RuntimeException, std::exception)
{
@@ -239,9 +232,6 @@ void SAL_CALL SidebarController::notifyContextChangeEvent (const css::ui::Contex
}
}
-
-
-
void SAL_CALL SidebarController::disposing (const css::lang::EventObject& rEventObject)
throw(css::uno::RuntimeException, std::exception)
{
@@ -250,9 +240,6 @@ void SAL_CALL SidebarController::disposing (const css::lang::EventObject& rEvent
dispose();
}
-
-
-
void SAL_CALL SidebarController::propertyChange (const css::beans::PropertyChangeEvent& rEvent)
throw(css::uno::RuntimeException, std::exception)
{
@@ -261,9 +248,6 @@ void SAL_CALL SidebarController::propertyChange (const css::beans::PropertyChang
maPropertyChangeForwarder.RequestCall();
}
-
-
-
void SAL_CALL SidebarController::statusChanged (const css::frame::FeatureStateEvent& rEvent)
throw(css::uno::RuntimeException, std::exception)
{
@@ -284,9 +268,6 @@ void SAL_CALL SidebarController::statusChanged (const css::frame::FeatureStateEv
}
}
-
-
-
void SAL_CALL SidebarController::requestLayout (void)
throw(css::uno::RuntimeException, std::exception)
{
@@ -437,9 +418,6 @@ void SidebarController::ProcessNewWidth (const sal_Int32 nNewWidth)
}
}
-
-
-
void SidebarController::UpdateConfigurations (void)
{
if (maCurrentContext != maRequestedContext
@@ -503,7 +481,6 @@ void SidebarController::UpdateConfigurations (void)
}
}
-
void SidebarController::RequestSwitchToDeck (
const ::rtl::OUString& rsDeckId)
{
@@ -705,9 +682,6 @@ void SidebarController::SwitchToDeck (
UpdateTitleBarIcons();
}
-
-
-
SharedPanel SidebarController::CreatePanel (
const OUString& rsPanelId,
vcl::Window* pParentWindow,
@@ -745,9 +719,6 @@ SharedPanel SidebarController::CreatePanel (
return pPanel;
}
-
-
-
Reference<ui::XUIElement> SidebarController::CreateUIElement (
const Reference<awt::XWindowPeer>& rxWindow,
const ::rtl::OUString& rsImplementationURL,
@@ -792,9 +763,6 @@ Reference<ui::XUIElement> SidebarController::CreateUIElement (
}
}
-
-
-
IMPL_LINK(SidebarController, WindowEventHandler, VclWindowEvent*, pEvent)
{
if (pEvent==NULL)
@@ -856,9 +824,6 @@ IMPL_LINK(SidebarController, WindowEventHandler, VclWindowEvent*, pEvent)
return sal_True;
}
-
-
-
void SidebarController::ShowPopupMenu (
const Rectangle& rButtonBox,
const ::std::vector<TabBar::DeckMenuData>& rMenuData) const
@@ -872,9 +837,6 @@ void SidebarController::ShowPopupMenu (
pMenu->Execute(mpParentWindow, aBox, POPUPMENU_EXECUTE_DOWN);
}
-
-
-
::boost::shared_ptr<PopupMenu> SidebarController::CreatePopupMenu (
const ::std::vector<TabBar::DeckMenuData>& rMenuData) const
{
@@ -938,9 +900,6 @@ void SidebarController::ShowPopupMenu (
return pMenu;
}
-
-
-
IMPL_LINK(SidebarController, OnMenuItemSelected, Menu*, pMenu)
{
if (pMenu == NULL)
@@ -988,9 +947,6 @@ IMPL_LINK(SidebarController, OnMenuItemSelected, Menu*, pMenu)
return 1;
}
-
-
-
void SidebarController::RequestCloseDeck (void)
{
mbIsDeckRequestedOpen = false;
@@ -1000,9 +956,6 @@ void SidebarController::RequestCloseDeck (void)
mpTabBar->RemoveDeckHighlight();
}
-
-
-
void SidebarController::RequestOpenDeck (void)
{
mbIsDeckRequestedOpen = true;
@@ -1014,7 +967,6 @@ bool SidebarController::IsDeckVisible(const OUString& rsDeckId)
return mbIsDeckOpen && mbIsDeckOpen.get() && msCurrentDeckId == rsDeckId;
}
-
void SidebarController::UpdateDeckOpenState (void)
{
if ( ! mbIsDeckRequestedOpen)
@@ -1051,13 +1003,6 @@ void SidebarController::UpdateDeckOpenState (void)
}
}
-
-
-
-
-
-
-
bool SidebarController::CanModifyChildWindowWidth (void)
{
SfxSplitWindow* pSplitWindow = GetSplitWindow();
@@ -1075,9 +1020,6 @@ bool SidebarController::CanModifyChildWindowWidth (void)
return false;
}
-
-
-
sal_Int32 SidebarController::SetChildWindowWidth (const sal_Int32 nNewWidth)
{
SfxSplitWindow* pSplitWindow = GetSplitWindow();
@@ -1102,9 +1044,6 @@ sal_Int32 SidebarController::SetChildWindowWidth (const sal_Int32 nNewWidth)
return static_cast<sal_Int32>(nColumnWidth);
}
-
-
-
void SidebarController::RestrictWidth (sal_Int32 nWidth)
{
SfxSplitWindow* pSplitWindow = GetSplitWindow();
@@ -1119,9 +1058,6 @@ void SidebarController::RestrictWidth (sal_Int32 nWidth)
}
}
-
-
-
SfxSplitWindow* SidebarController::GetSplitWindow (void)
{
if (mpParentWindow != NULL)
@@ -1143,9 +1079,6 @@ SfxSplitWindow* SidebarController::GetSplitWindow (void)
return NULL;
}
-
-
-
void SidebarController::UpdateCloseIndicator (const bool bCloseAfterDrag)
{
if (mpParentWindow == NULL)
@@ -1181,9 +1114,6 @@ void SidebarController::UpdateCloseIndicator (const bool bCloseAfterDrag)
}
}
-
-
-
void SidebarController::UpdateTitleBarIcons (void)
{
if ( ! mpCurrentDeck)
@@ -1225,20 +1155,12 @@ void SidebarController::UpdateTitleBarIcons (void)
}
}
-
-
-
void SidebarController::ShowPanel (const Panel& rPanel)
{
if (mpCurrentDeck)
mpCurrentDeck->ShowPanel(rPanel);
}
-
-
-
-
-
} } // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unotools/source/config/viewoptions.cxx b/unotools/source/config/viewoptions.cxx
index fd6189989d99..403a82b053a2 100644
--- a/unotools/source/config/viewoptions.cxx
+++ b/unotools/source/config/viewoptions.cxx
@@ -326,11 +326,11 @@ css::uno::Sequence< css::beans::NamedValue > SvtViewOptionsBase_Impl::GetUserDat
xNode->getByName(PROPERTY_USERDATA) >>= xUserData;
if (xUserData.is())
{
- const css::uno::Sequence< OUString > lNames = xUserData->getElementNames();
- const OUString* pNames = lNames.getConstArray();
- sal_Int32 c = lNames.getLength();
- sal_Int32 i = 0;
- css::uno::Sequence< css::beans::NamedValue > lUserData(c);
+ const css::uno::Sequence<OUString> lNames = xUserData->getElementNames();
+ const OUString* pNames = lNames.getConstArray();
+ sal_Int32 c = lNames.getLength();
+ sal_Int32 i = 0;
+ css::uno::Sequence< css::beans::NamedValue > lUserData(c);
for (i=0; i<c; ++i)
{
generated by cgit (git 2.34.1) at 2025-02-08 04:49:20 +0000