[Libreoffice-commits] core.git: dbaccess/source sfx2/source svx/source sw/source

[Caolán McNamara]

 dbaccess/source/ui/querydesign/LimitBox.cxx       |    3 ++-
 sfx2/source/sidebar/SidebarToolBox.cxx            |    3 ++-
 svx/source/dialog/pagectrl.cxx                    |    3 ++-
 svx/source/sidebar/possize/SidebarDialControl.cxx |    3 ++-
 svx/source/sidebar/text/SvxSBFontNameBox.cxx      |    4 ++--
 sw/source/ui/config/optload.cxx                   |    2 +-
 sw/source/ui/frmdlg/cption.cxx                    |    2 +-
 sw/source/ui/misc/bookmark.cxx                    |    2 +-
 8 files changed, 13 insertions(+), 9 deletions(-)

New commits:
commit 7a61efe4220e5f25a9f5809d5b928960bc30f115
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jun 27 16:28:44 2013 +0100

    add missing VclBuilder::stringmap argument to some builder functions
    
    Change-Id: I57e13920b4707ebe5b6a7149dbdbfc45593c0d9d

diff --git a/dbaccess/source/ui/querydesign/LimitBox.cxx b/dbaccess/source/ui/querydesign/LimitBox.cxx
index b2d267e..52f436e 100644
--- a/dbaccess/source/ui/querydesign/LimitBox.cxx
+++ b/dbaccess/source/ui/querydesign/LimitBox.cxx
@@ -7,6 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include <vcl/builder.hxx>
 #include "LimitBox.hxx"
 #include "dbu_qry.hrc"
 #include "moduledbu.hxx"
@@ -111,7 +112,7 @@ void LimitBox::LoadDefaultLimits()
     }
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeLimitBox( Window *pParent )
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeLimitBox( Window *pParent, VclBuilder::stringmap & )
 {
     LimitBox* pBox = new LimitBox( pParent, WB_DROPDOWN | WB_VSCROLL );
     return pBox;
diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx b/sfx2/source/sidebar/SidebarToolBox.cxx
index 345d360..8b0e899 100644
--- a/sfx2/source/sidebar/SidebarToolBox.cxx
+++ b/sfx2/source/sidebar/SidebarToolBox.cxx
@@ -23,6 +23,7 @@
 #include "sfx2/sidebar/Theme.hxx"
 #include "sfx2/sidebar/Tools.hxx"
 
+#include <vcl/builder.hxx>
 #include <vcl/gradient.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <svtools/miscopt.hxx>
@@ -95,7 +96,7 @@ SidebarToolBox::SidebarToolBox (Window* pParentWindow)
 #endif
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSidebarToolBox(Window *pParent)
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSidebarToolBox(Window *pParent, VclBuilder::stringmap &)
 {
     return new SidebarToolBox(pParent);
 }
diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx
index e4469cd..f0bee35 100644
--- a/svx/source/dialog/pagectrl.cxx
+++ b/svx/source/dialog/pagectrl.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <vcl/bitmap.hxx>
+#include <vcl/builder.hxx>
 #include <editeng/frmdiritem.hxx>
 #include <svx/pageitem.hxx>
 #include <svx/pagectrl.hxx>
@@ -146,7 +147,7 @@ SvxPageWindow::~SvxPageWindow()
     delete pFtBorder;
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxPageWindow(Window *pParent)
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxPageWindow(Window *pParent, VclBuilder::stringmap &)
 {
     return new SvxPageWindow(pParent);
 }
diff --git a/svx/source/sidebar/possize/SidebarDialControl.cxx b/svx/source/sidebar/possize/SidebarDialControl.cxx
index 82163dd..aacdbe9 100644
--- a/svx/source/sidebar/possize/SidebarDialControl.cxx
+++ b/svx/source/sidebar/possize/SidebarDialControl.cxx
@@ -18,6 +18,7 @@
  */
 #include <svx/sidebar/SidebarDialControl.hxx>
 
+#include <vcl/builder.hxx>
 #include <vcl/svapp.hxx>
 
 namespace svx { namespace sidebar {
@@ -28,7 +29,7 @@ SidebarDialControl::SidebarDialControl (Window* pParent, WinBits nBits)
     Init(GetOutputSizePixel());
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSidebarDialControl(Window *pParent)
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSidebarDialControl(Window *pParent, VclBuilder::stringmap &)
 {
     return new SidebarDialControl(pParent, WB_TABSTOP);
 }
diff --git a/svx/source/sidebar/text/SvxSBFontNameBox.cxx b/svx/source/sidebar/text/SvxSBFontNameBox.cxx
index f5ca5c3..89910cc 100644
--- a/svx/source/sidebar/text/SvxSBFontNameBox.cxx
+++ b/svx/source/sidebar/text/SvxSBFontNameBox.cxx
@@ -24,7 +24,7 @@
 #include <editeng/flstitem.hxx>
 #include <editeng/editids.hrc>
 #include <editeng/fontitem.hxx>
-
+#include <vcl/builder.hxx>
 
 const static sal_uInt16 MAX_MRU_FONTNAME_ENTRIES = 5;
 
@@ -104,7 +104,7 @@ SvxSBFontNameBox::SvxSBFontNameBox( Window* pParent ) :
 //  StartListening( *SFX_APP() );
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxSBFontNameBox(Window *pParent)
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxSBFontNameBox(Window *pParent, VclBuilder::stringmap &)
 {
     return new SvxSBFontNameBox(pParent);
 }
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index 942c6b7..0bc1b8b 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -388,7 +388,7 @@ void SwCaptionPreview::Paint( const Rectangle& rRect )
     DrawText( Point( 4, 6 ), maText );
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSwCaptionPreview(Window* pParent)
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSwCaptionPreview(Window* pParent, VclBuilder::stringmap &)
 {
     return new SwCaptionPreview(pParent);
 }
diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx
index b7bb316..3645a9c 100644
--- a/sw/source/ui/frmdlg/cption.cxx
+++ b/sw/source/ui/frmdlg/cption.cxx
@@ -524,7 +524,7 @@ long CategoryBox::PreNotify( NotifyEvent& rNEvt )
     return nHandled;
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeCategoryBox(Window* pParent)
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeCategoryBox(Window* pParent, VclBuilder::stringmap &)
 {
     CategoryBox* pCategoryBox = new CategoryBox(pParent, WB_LEFT | WB_DROPDOWN | WB_VCENTER | WB_3DLOOK | WB_SORT);
     pCategoryBox->EnableAutoSize(true);
diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx
index 90a2d41..1a520f7 100644
--- a/sw/source/ui/misc/bookmark.cxx
+++ b/sw/source/ui/misc/bookmark.cxx
@@ -236,7 +236,7 @@ long BookmarkCombo::PreNotify( NotifyEvent& rNEvt )
     return nHandled;
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeBookmarkCombo(Window* pParent)
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeBookmarkCombo(Window* pParent, VclBuilder::stringmap &)
 {
     return new BookmarkCombo(pParent);
 }