Kaydet (Commit) 9f81582c authored tarafından Michael Meeks's avatar Michael Meeks

Remove erroneous SAL_NO_ACQUIRE pieces introduced in error.

Change-Id: If8cd8fafea1f88360d86552ac94a985b1d1feae8
üst 4fed8865
...@@ -374,7 +374,7 @@ OColumnTreeBox::OColumnTreeBox( vcl::Window* pParent, WinBits nBits ) ...@@ -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 &) 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) void OColumnTreeBox::InitEntry(SvTreeListEntry* pEntry, const OUString& rStr, const Image& rImg1, const Image& rImg2, SvLBoxButtonKind eButtonKind)
......
...@@ -2286,8 +2286,7 @@ void BrowseBox::SetMode( BrowserMode nMode ) ...@@ -2286,8 +2286,7 @@ void BrowseBox::SetMode( BrowserMode nMode )
( nMode & BROWSER_TRACKING_TIPS ) == BROWSER_TRACKING_TIPS ( nMode & BROWSER_TRACKING_TIPS ) == BROWSER_TRACKING_TIPS
? VclPtr<BrowserScrollBar>::Create( this, nVScrollWinBits, ? VclPtr<BrowserScrollBar>::Create( this, nVScrollWinBits,
static_cast<BrowserDataWin*>( pDataWin.get() ) ) static_cast<BrowserDataWin*>( pDataWin.get() ) )
: VclPtr<ScrollBar>::Create( this, nVScrollWinBits ), : VclPtr<ScrollBar>::Create( this, nVScrollWinBits ));
SAL_NO_ACQUIRE);
pVScroll->SetLineSize( 1 ); pVScroll->SetLineSize( 1 );
pVScroll->SetPageSize(1); pVScroll->SetPageSize(1);
pVScroll->SetScrollHdl( LINK( this, BrowseBox, ScrollHdl ) ); pVScroll->SetScrollHdl( LINK( this, BrowseBox, ScrollHdl ) );
......
...@@ -539,13 +539,10 @@ VclPtr<vcl::Window> AreaPropertyPanel::Create ( ...@@ -539,13 +539,10 @@ VclPtr<vcl::Window> AreaPropertyPanel::Create (
if (pBindings == NULL) if (pBindings == NULL)
throw lang::IllegalArgumentException("no SfxBindings given to AreaPropertyPanel::Create", NULL, 2); throw lang::IllegalArgumentException("no SfxBindings given to AreaPropertyPanel::Create", NULL, 2);
return VclPtr<vcl::Window>( return VclPtr<AreaPropertyPanel>::Create(
VclPtr<AreaPropertyPanel>::Create(
pParent, pParent,
rxFrame, rxFrame,
pBindings), pBindings);
SAL_NO_ACQUIRE);
} }
......
...@@ -254,13 +254,10 @@ VclPtr<vcl::Window> GraphicPropertyPanel::Create ( ...@@ -254,13 +254,10 @@ VclPtr<vcl::Window> GraphicPropertyPanel::Create (
if (pBindings == NULL) if (pBindings == NULL)
throw lang::IllegalArgumentException("no SfxBindings given to GraphicPropertyPanel::Create", NULL, 2); throw lang::IllegalArgumentException("no SfxBindings given to GraphicPropertyPanel::Create", NULL, 2);
return VclPtr<vcl::Window>( return VclPtr<GraphicPropertyPanel>::Create(
VclPtr<GraphicPropertyPanel>::Create(
pParent, pParent,
rxFrame, rxFrame,
pBindings), pBindings);
SAL_NO_ACQUIRE);
} }
......
...@@ -310,9 +310,7 @@ VclPtr<vcl::Window> LinePropertyPanel::Create ( ...@@ -310,9 +310,7 @@ VclPtr<vcl::Window> LinePropertyPanel::Create (
if (pBindings == NULL) if (pBindings == NULL)
throw lang::IllegalArgumentException("no SfxBindings given to LinePropertyPanel::Create", NULL, 2); throw lang::IllegalArgumentException("no SfxBindings given to LinePropertyPanel::Create", NULL, 2);
return VclPtr<vcl::Window>( return VclPtr<LinePropertyPanel>::Create(pParent, rxFrame, pBindings);
VclPtr<LinePropertyPanel>::Create(pParent, rxFrame, pBindings),
SAL_NO_ACQUIRE);
} }
void LinePropertyPanel::DataChanged(const DataChangedEvent& /*rEvent*/) void LinePropertyPanel::DataChanged(const DataChangedEvent& /*rEvent*/)
......
...@@ -68,14 +68,11 @@ VclPtr<vcl::Window> ParaPropertyPanel::Create ( ...@@ -68,14 +68,11 @@ VclPtr<vcl::Window> ParaPropertyPanel::Create (
if (pBindings == NULL) if (pBindings == NULL)
throw lang::IllegalArgumentException("no SfxBindings given to ParaPropertyPanel::Create", NULL, 2); throw lang::IllegalArgumentException("no SfxBindings given to ParaPropertyPanel::Create", NULL, 2);
return VclPtr<vcl::Window>( return VclPtr<ParaPropertyPanel>::Create(
VclPtr<ParaPropertyPanel>::Create(
pParent, pParent,
rxFrame, rxFrame,
pBindings, pBindings,
rxSidebar), rxSidebar);
SAL_NO_ACQUIRE);
} }
void ParaPropertyPanel::HandleContextChange ( void ParaPropertyPanel::HandleContextChange (
......
...@@ -260,14 +260,11 @@ VclPtr<vcl::Window> PosSizePropertyPanel::Create ( ...@@ -260,14 +260,11 @@ VclPtr<vcl::Window> PosSizePropertyPanel::Create (
if (pBindings == NULL) if (pBindings == NULL)
throw lang::IllegalArgumentException("no SfxBindings given to PosSizePropertyPanel::Create", NULL, 2); throw lang::IllegalArgumentException("no SfxBindings given to PosSizePropertyPanel::Create", NULL, 2);
return VclPtr<vcl::Window>( return VclPtr<PosSizePropertyPanel>::Create(
VclPtr<PosSizePropertyPanel>::Create(
pParent, pParent,
rxFrame, rxFrame,
pBindings, pBindings,
rxSidebar), rxSidebar);
SAL_NO_ACQUIRE);
} }
......
...@@ -75,14 +75,11 @@ VclPtr<vcl::Window> TextPropertyPanel::Create ( ...@@ -75,14 +75,11 @@ VclPtr<vcl::Window> TextPropertyPanel::Create (
if (pBindings == NULL) if (pBindings == NULL)
throw lang::IllegalArgumentException("no SfxBindings given to TextPropertyPanel::Create", NULL, 2); throw lang::IllegalArgumentException("no SfxBindings given to TextPropertyPanel::Create", NULL, 2);
return VclPtr< vcl::Window >( return VclPtr<TextPropertyPanel>::Create(
VclPtr<TextPropertyPanel>::Create(
pParent, pParent,
rxFrame, rxFrame,
pBindings, pBindings,
rContext), rContext);
SAL_NO_ACQUIRE);
} }
......
...@@ -54,13 +54,10 @@ VclPtr<vcl::Window> WrapPropertyPanel::Create ( ...@@ -54,13 +54,10 @@ VclPtr<vcl::Window> WrapPropertyPanel::Create (
if (pBindings == NULL) if (pBindings == NULL)
throw ::com::sun::star::lang::IllegalArgumentException("no SfxBindings given to WrapPropertyPanel::Create", NULL, 2); throw ::com::sun::star::lang::IllegalArgumentException("no SfxBindings given to WrapPropertyPanel::Create", NULL, 2);
return VclPtr<vcl::Window>( return VclPtr<WrapPropertyPanel>::Create(
VclPtr<WrapPropertyPanel>::Create(
pParent, pParent,
rxFrame, rxFrame,
pBindings), pBindings);
SAL_NO_ACQUIRE);
} }
WrapPropertyPanel::WrapPropertyPanel( WrapPropertyPanel::WrapPropertyPanel(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment