include/sfx2/titledockwin.hxx | 4 --
sd/AllLangResTarget_sd.mk | 1
sd/source/ui/dlg/PaneChildWindows.cxx | 12 +------
sd/source/ui/dlg/PaneDockingWindow.cxx | 7 ++--
sd/source/ui/dlg/PaneDockingWindow.src | 54 ---------------------------------
sd/source/ui/inc/PaneChildWindows.hxx | 3 -
sd/source/ui/inc/PaneDockingWindow.hrc | 23 --------------
sd/source/ui/inc/PaneDockingWindow.hxx | 5 ---
sfx2/source/dialog/titledockwin.cxx | 21 ------------
sw/source/ui/app/mn.src | 4 +-
10 files changed, 10 insertions(+), 124 deletions(-)
New commits:
commit def217464a2ac4a5d140725ba0e1247ff85fbd2e
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Dec 22 15:15:20 2014 +0000
fix build
Change-Id: I354db780cef6f9a653f5eb9a734b7edf258c191e
diff --git a/sw/source/ui/app/mn.src b/sw/source/ui/app/mn.src
index 2dce680..5d57cf1 100644
--- a/sw/source/ui/app/mn.src
+++ b/sw/source/ui/app/mn.src
@@ -1223,8 +1223,8 @@ String MN_GRF_POPUPMENU
};\
#define MN_ALIGN_FRAME \
- MN_ARRANGE_FRAME
- MN_ALIGNMENT_FRAME
+ MN_ARRANGE_FRAME \
+ MN_ALIGNMENT_FRAME \
MN_ANCHOR
Menu MN_GRF_POPUPMENU
commit 2f25dc9644397ff4fc5e9586106aaca32950b596
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Dec 22 15:07:13 2014 +0000
de-resource FLT_LEFT_PANE_[DRAW|IMPRESS]_DOCKING_WINDOW
Change-Id: I5042141eaa0dfbf9d2184b86b537a9b149c9a06c
diff --git a/include/sfx2/titledockwin.hxx b/include/sfx2/titledockwin.hxx
index 6e45253..97fdebc 100644
--- a/include/sfx2/titledockwin.hxx
+++ b/include/sfx2/titledockwin.hxx
@@ -42,10 +42,6 @@ namespace sfx2
vcl::Window* i_pParent, WinBits i_nStyle = 0
);
- TitledDockingWindow( SfxBindings* i_pBindings, SfxChildWindow*
i_pChildWindow,
- vcl::Window* i_pParent, const ResId& i_rResId
- );
-
virtual ~TitledDockingWindow();
/** sets a title to be displayed in the docking window
diff --git a/sd/AllLangResTarget_sd.mk b/sd/AllLangResTarget_sd.mk
index f9bb1ef..027f599 100644
--- a/sd/AllLangResTarget_sd.mk
+++ b/sd/AllLangResTarget_sd.mk
@@ -41,7 +41,6 @@ $(eval $(call gb_SrsTarget_add_files,sd/res,\
sd/source/ui/app/strings.src \
sd/source/ui/app/toolbox.src \
sd/source/ui/dlg/navigatr.src \
- sd/source/ui/dlg/PaneDockingWindow.src \
sd/source/ui/slideshow/slideshow.src \
sd/source/ui/view/DocumentRenderer.src \
))
diff --git a/sd/source/ui/dlg/PaneChildWindows.cxx
b/sd/source/ui/dlg/PaneChildWindows.cxx
index 7d6e75f..89a5b65 100644
--- a/sd/source/ui/dlg/PaneChildWindows.cxx
+++ b/sd/source/ui/dlg/PaneChildWindows.cxx
@@ -18,7 +18,6 @@
*/
#include "PaneChildWindows.hxx"
-#include "PaneDockingWindow.hrc"
#include "PaneDockingWindow.hxx"
#include "ViewShellBase.hxx"
#include "framework/FrameworkHelper.hxx"
@@ -48,23 +47,20 @@ SFX_IMPL_DOCKINGWINDOW_WITHID(LeftPaneImpressChildWindow,
SID_LEFT_PANE_IMPRESS)
SFX_IMPL_DOCKINGWINDOW_WITHID(LeftPaneDrawChildWindow, SID_LEFT_PANE_DRAW)
//===== PaneChildWindow =======================================================
-
PaneChildWindow::PaneChildWindow (
vcl::Window* pParentWindow,
sal_uInt16 nId,
SfxBindings* pBindings,
SfxChildWinInfo* pInfo,
- const sal_uInt16 nDockWinTitleResId,
const sal_uInt16 nTitleBarResId,
SfxChildAlignment eAlignment)
: SfxChildWindow (pParentWindow, nId)
{
- pWindow = new PaneDockingWindow (
+ pWindow = new PaneDockingWindow(
pBindings,
this,
pParentWindow,
- SdResId( nDockWinTitleResId ),
- SD_RESSTR( nTitleBarResId ) );
+ SD_RESSTR(nTitleBarResId));
eChildAlignment = eAlignment;
static_cast<SfxDockingWindow*>(pWindow)->Initialize(pInfo);
SetHideNotDelete(true);
@@ -88,7 +84,6 @@ PaneChildWindow::~PaneChildWindow (void)
}
//===== LeftPaneImpressChildWindow ============================================
-
LeftPaneImpressChildWindow::LeftPaneImpressChildWindow (
vcl::Window* pParentWindow,
sal_uInt16 nId,
@@ -99,14 +94,12 @@ LeftPaneImpressChildWindow::LeftPaneImpressChildWindow (
nId,
pBindings,
pInfo,
- FLT_LEFT_PANE_IMPRESS_DOCKING_WINDOW,
STR_LEFT_PANE_IMPRESS_TITLE,
SFX_ALIGN_LEFT)
{
}
//===== LeftPaneDrawChildWindow ===============================================
-
LeftPaneDrawChildWindow::LeftPaneDrawChildWindow (
vcl::Window* pParentWindow,
sal_uInt16 nId,
@@ -117,7 +110,6 @@ LeftPaneDrawChildWindow::LeftPaneDrawChildWindow (
nId,
pBindings,
pInfo,
- FLT_LEFT_PANE_DRAW_DOCKING_WINDOW,
STR_LEFT_PANE_DRAW_TITLE,
SFX_ALIGN_LEFT)
{
diff --git a/sd/source/ui/dlg/PaneDockingWindow.cxx
b/sd/source/ui/dlg/PaneDockingWindow.cxx
index 286f3e1..5363051 100644
--- a/sd/source/ui/dlg/PaneDockingWindow.cxx
+++ b/sd/source/ui/dlg/PaneDockingWindow.cxx
@@ -39,10 +39,11 @@ namespace sd {
PaneDockingWindow::PaneDockingWindow(
SfxBindings *_pBindings, SfxChildWindow *pChildWindow, vcl::Window*
pParent,
- const ResId& rResId, const OUString& rsTitle )
- :TitledDockingWindow( _pBindings, pChildWindow, pParent, rResId )
+ const OUString& rsTitle )
+ : TitledDockingWindow(_pBindings, pChildWindow, pParent,
WB_MOVEABLE|WB_CLOSEABLE|WB_HIDE|WB_3DLOOK)
{
- SetTitle( rsTitle );
+ SetTitle(rsTitle);
+ SetSizePixel(LogicToPixel(Size(100,200), MAP_APPFONT));
}
PaneDockingWindow::~PaneDockingWindow (void)
diff --git a/sd/source/ui/dlg/PaneDockingWindow.src
b/sd/source/ui/dlg/PaneDockingWindow.src
deleted file mode 100644
index f69b3c1..0000000
--- a/sd/source/ui/dlg/PaneDockingWindow.src
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "PaneDockingWindow.hrc"
-
-DockingWindow FLT_LEFT_PANE_IMPRESS_DOCKING_WINDOW
-{
- HelpID = "sd:DockingWindow:FLT_LEFT_PANE_IMPRESS_DOCKING_WINDOW";
- Border = TRUE ;
- Hide = TRUE ;
- SVLook = TRUE ;
- Sizeable = TRUE ;
- Moveable = TRUE ;
- Closeable = TRUE ;
- Zoomable = TRUE ;
- Dockable = TRUE ;
- EnableResizing = TRUE ;
- Size = MAP_APPFONT (100,200) ;
- Text [ en-US ] = "Slide Pane" ;
-};
-
-DockingWindow FLT_LEFT_PANE_DRAW_DOCKING_WINDOW
-{
- HelpID = "sd:DockingWindow:FLT_LEFT_PANE_DRAW_DOCKING_WINDOW";
- Border = TRUE ;
- Hide = TRUE ;
- SVLook = TRUE ;
- Sizeable = TRUE ;
- Moveable = TRUE ;
- Closeable = TRUE ;
- Zoomable = TRUE ;
- Dockable = TRUE ;
- EnableResizing = TRUE ;
- Size = MAP_APPFONT (100,200) ;
- Text [ en-US ] = "Page Pane" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/PaneChildWindows.hxx
b/sd/source/ui/inc/PaneChildWindows.hxx
index 8b76b9e..09c0e56 100644
--- a/sd/source/ui/inc/PaneChildWindows.hxx
+++ b/sd/source/ui/inc/PaneChildWindows.hxx
@@ -34,10 +34,9 @@ public:
sal_uInt16 nId,
SfxBindings* pBindings,
SfxChildWinInfo* pInfo,
- const sal_uInt16 nDockWinTitleResId,
const sal_uInt16 nTitleBarResId,
SfxChildAlignment eAlignment);
- virtual ~PaneChildWindow (void);
+ virtual ~PaneChildWindow();
};
class LeftPaneImpressChildWindow
diff --git a/sd/source/ui/inc/PaneDockingWindow.hrc
b/sd/source/ui/inc/PaneDockingWindow.hrc
deleted file mode 100644
index 9bf5474..0000000
--- a/sd/source/ui/inc/PaneDockingWindow.hrc
+++ /dev/null
@@ -1,23 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#define FLT_LEFT_PANE_IMPRESS_DOCKING_WINDOW 792
-#define FLT_LEFT_PANE_DRAW_DOCKING_WINDOW 793
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/PaneDockingWindow.hxx
b/sd/source/ui/inc/PaneDockingWindow.hxx
index adba60a..54d6bf4 100644
--- a/sd/source/ui/inc/PaneDockingWindow.hxx
+++ b/sd/source/ui/inc/PaneDockingWindow.hxx
@@ -42,8 +42,6 @@ public:
window.
@param pParent
The parent window of the new docking window.
- @param rResId
- The resource is used to determine initial size and attributes.
@param rsTitle
the initial title
*/
@@ -51,10 +49,9 @@ public:
SfxBindings *pBindings,
SfxChildWindow *pChildWindow,
vcl::Window* pParent,
- const ResId& rResId,
const OUString& rsTitle);
- virtual ~PaneDockingWindow (void);
+ virtual ~PaneDockingWindow();
virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE;
virtual void MouseButtonDown (const MouseEvent& rEvent) SAL_OVERRIDE;
/** When docked the given range is passed to the parent SplitWindow.
diff --git a/sfx2/source/dialog/titledockwin.cxx
b/sfx2/source/dialog/titledockwin.cxx
index 02f0601..74bc4ee 100644
--- a/sfx2/source/dialog/titledockwin.cxx
+++ b/sfx2/source/dialog/titledockwin.cxx
@@ -30,12 +30,7 @@
namespace sfx2
{
-
-
-
//= TitledDockingWindow
-
-
TitledDockingWindow::TitledDockingWindow( SfxBindings* i_pBindings,
SfxChildWindow* i_pChildWindow, vcl::Window* i_pParent,
WinBits i_nStyle )
:SfxDockingWindow( i_pBindings, i_pChildWindow, i_pParent, i_nStyle )
@@ -49,21 +44,6 @@ namespace sfx2
impl_construct();
}
-
- TitledDockingWindow::TitledDockingWindow( SfxBindings* i_pBindings,
SfxChildWindow* i_pChildWindow, vcl::Window* i_pParent,
- const ResId& i_rResId )
- :SfxDockingWindow( i_pBindings, i_pChildWindow, i_pParent, i_rResId )
- ,m_sTitle()
- ,m_aToolbox( this )
- ,m_aContentWindow( this )
- ,m_aBorder( 3, 1, 3, 3 )
- ,m_bLayoutPending( false )
- ,m_nTitleBarHeight(0)
- {
- impl_construct();
- }
-
-
void TitledDockingWindow::impl_construct()
{
SetBackground( Wallpaper() );
@@ -77,7 +57,6 @@ namespace sfx2
m_aContentWindow.Show();
}
-
TitledDockingWindow::~TitledDockingWindow()
{
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
