[Libreoffice-commits] core.git: Branch 'feature/vclptr' - dbaccess/source svtools/source svx/source sw/source
Michael Meeks
michael.meeks at collabora.com
Tue Apr 21 09:30:21 PDT 2015
dbaccess/source/ui/misc/WNameMatch.cxx | 2 +-
svtools/source/brwbox/brwbox1.cxx | 3 +--
svx/source/sidebar/area/AreaPropertyPanel.cxx | 7 ++-----
svx/source/sidebar/graphic/GraphicPropertyPanel.cxx | 7 ++-----
svx/source/sidebar/line/LinePropertyPanel.cxx | 4 +---
svx/source/sidebar/paragraph/ParaPropertyPanel.cxx | 7 ++-----
svx/source/sidebar/possize/PosSizePropertyPanel.cxx | 7 ++-----
svx/source/sidebar/text/TextPropertyPanel.cxx | 7 ++-----
sw/source/uibase/sidebar/WrapPropertyPanel.cxx | 7 ++-----
9 files changed, 15 insertions(+), 36 deletions(-)
New commits:
commit 9f81582c7e998f26a0f499ba2ef9c845b9df2358
Author: Michael Meeks <michael.meeks at collabora.com>
Date: Tue Apr 21 17:03:46 2015 +0100
Remove erroneous SAL_NO_ACQUIRE pieces introduced in error.
Change-Id: If8cd8fafea1f88360d86552ac94a985b1d1feae8
diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx
index 3ddbc83..46c7634 100644
--- a/dbaccess/source/ui/misc/WNameMatch.cxx
+++ b/dbaccess/source/ui/misc/WNameMatch.cxx
@@ -374,7 +374,7 @@ OColumnTreeBox::OColumnTreeBox( vcl::Window* pParent, WinBits nBits )
extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeOColumnTreeBox(vcl::Window *pParent, VclBuilder::stringmap &)
{
- return new OColumnTreeBox(pParent, SAL_NO_ACQUIRE);
+ return new OColumnTreeBox(pParent);
}
void OColumnTreeBox::InitEntry(SvTreeListEntry* pEntry, const OUString& rStr, const Image& rImg1, const Image& rImg2, SvLBoxButtonKind eButtonKind)
diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx
index b13cc7c..0b5d829 100644
--- a/svtools/source/brwbox/brwbox1.cxx
+++ b/svtools/source/brwbox/brwbox1.cxx
@@ -2286,8 +2286,7 @@ void BrowseBox::SetMode( BrowserMode nMode )
( nMode & BROWSER_TRACKING_TIPS ) == BROWSER_TRACKING_TIPS
? VclPtr<BrowserScrollBar>::Create( this, nVScrollWinBits,
static_cast<BrowserDataWin*>( pDataWin.get() ) )
- : VclPtr<ScrollBar>::Create( this, nVScrollWinBits ),
- SAL_NO_ACQUIRE);
+ : VclPtr<ScrollBar>::Create( this, nVScrollWinBits ));
pVScroll->SetLineSize( 1 );
pVScroll->SetPageSize(1);
pVScroll->SetScrollHdl( LINK( this, BrowseBox, ScrollHdl ) );
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx b/svx/source/sidebar/area/AreaPropertyPanel.cxx
index 78d948e..64f8c2f 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx
@@ -539,13 +539,10 @@ VclPtr<vcl::Window> AreaPropertyPanel::Create (
if (pBindings == NULL)
throw lang::IllegalArgumentException("no SfxBindings given to AreaPropertyPanel::Create", NULL, 2);
- return VclPtr<vcl::Window>(
- VclPtr<AreaPropertyPanel>::Create(
-
+ return VclPtr<AreaPropertyPanel>::Create(
pParent,
rxFrame,
- pBindings),
- SAL_NO_ACQUIRE);
+ pBindings);
}
diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
index 81b0cac..3b14464 100644
--- a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
+++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
@@ -254,13 +254,10 @@ VclPtr<vcl::Window> GraphicPropertyPanel::Create (
if (pBindings == NULL)
throw lang::IllegalArgumentException("no SfxBindings given to GraphicPropertyPanel::Create", NULL, 2);
- return VclPtr<vcl::Window>(
- VclPtr<GraphicPropertyPanel>::Create(
-
+ return VclPtr<GraphicPropertyPanel>::Create(
pParent,
rxFrame,
- pBindings),
- SAL_NO_ACQUIRE);
+ pBindings);
}
diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx
index b90165d..37d7402 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.cxx
@@ -310,9 +310,7 @@ VclPtr<vcl::Window> LinePropertyPanel::Create (
if (pBindings == NULL)
throw lang::IllegalArgumentException("no SfxBindings given to LinePropertyPanel::Create", NULL, 2);
- return VclPtr<vcl::Window>(
- VclPtr<LinePropertyPanel>::Create(pParent, rxFrame, pBindings),
- SAL_NO_ACQUIRE);
+ return VclPtr<LinePropertyPanel>::Create(pParent, rxFrame, pBindings);
}
void LinePropertyPanel::DataChanged(const DataChangedEvent& /*rEvent*/)
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index 080558a..e74ad60 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -68,14 +68,11 @@ VclPtr<vcl::Window> ParaPropertyPanel::Create (
if (pBindings == NULL)
throw lang::IllegalArgumentException("no SfxBindings given to ParaPropertyPanel::Create", NULL, 2);
- return VclPtr<vcl::Window>(
- VclPtr<ParaPropertyPanel>::Create(
-
+ return VclPtr<ParaPropertyPanel>::Create(
pParent,
rxFrame,
pBindings,
- rxSidebar),
- SAL_NO_ACQUIRE);
+ rxSidebar);
}
void ParaPropertyPanel::HandleContextChange (
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index f675c30..3d64e96 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -260,14 +260,11 @@ VclPtr<vcl::Window> PosSizePropertyPanel::Create (
if (pBindings == NULL)
throw lang::IllegalArgumentException("no SfxBindings given to PosSizePropertyPanel::Create", NULL, 2);
- return VclPtr<vcl::Window>(
- VclPtr<PosSizePropertyPanel>::Create(
-
+ return VclPtr<PosSizePropertyPanel>::Create(
pParent,
rxFrame,
pBindings,
- rxSidebar),
- SAL_NO_ACQUIRE);
+ rxSidebar);
}
diff --git a/svx/source/sidebar/text/TextPropertyPanel.cxx b/svx/source/sidebar/text/TextPropertyPanel.cxx
index 295e3e2..35a9aca 100644
--- a/svx/source/sidebar/text/TextPropertyPanel.cxx
+++ b/svx/source/sidebar/text/TextPropertyPanel.cxx
@@ -75,14 +75,11 @@ VclPtr<vcl::Window> TextPropertyPanel::Create (
if (pBindings == NULL)
throw lang::IllegalArgumentException("no SfxBindings given to TextPropertyPanel::Create", NULL, 2);
- return VclPtr< vcl::Window >(
- VclPtr<TextPropertyPanel>::Create(
-
+ return VclPtr<TextPropertyPanel>::Create(
pParent,
rxFrame,
pBindings,
- rContext),
- SAL_NO_ACQUIRE);
+ rContext);
}
diff --git a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
index 76db671..2dfe37c 100644
--- a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
+++ b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
@@ -54,13 +54,10 @@ VclPtr<vcl::Window> WrapPropertyPanel::Create (
if (pBindings == NULL)
throw ::com::sun::star::lang::IllegalArgumentException("no SfxBindings given to WrapPropertyPanel::Create", NULL, 2);
- return VclPtr<vcl::Window>(
- VclPtr<WrapPropertyPanel>::Create(
-
+ return VclPtr<WrapPropertyPanel>::Create(
pParent,
rxFrame,
- pBindings),
- SAL_NO_ACQUIRE);
+ pBindings);
}
WrapPropertyPanel::WrapPropertyPanel(
More information about the Libreoffice-commits
mailing list