[Libreoffice-commits] core.git: sc/source sw/source

[Michael Meeks]

 sc/source/ui/view/prevwsh.cxx                  |    3 +--
 sc/source/ui/view/tabvwsh4.cxx                 |    5 ++---
 sw/source/uibase/sidebar/PagePropertyPanel.cxx |   10 +++-------
 sw/source/uibase/uiview/viewprt.cxx            |    4 +---
 4 files changed, 7 insertions(+), 15 deletions(-)

New commits:
commit a3deb4866890ca6d4a41df0f08107eb75b132716
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Thu May 7 13:16:13 2015 +0100

    tdf#91127 - audit for unfortunate SAL_NO_ACQUIRE referencing issues.
    
    Change-Id: I738f3ea1bf9f003f2b146cda0a8f986375eacd2b

diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index 970eff0..b188464 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -538,8 +538,7 @@ VclPtr<SfxTabPage> ScPreviewShell::CreatePrintOptionsPage( vcl::Window *pParent,
     OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
     ::CreateTabPage ScTpPrintOptionsCreate = pFact->GetTabPageCreatorFunc( RID_SCPAGE_PRINT );
     if ( ScTpPrintOptionsCreate )
-        return VclPtr<SfxTabPage>((*ScTpPrintOptionsCreate)( pParent, &rOptions),
-                                  SAL_NO_ACQUIRE);
+        return ScTpPrintOptionsCreate( pParent, &rOptions );
     return VclPtr<SfxTabPage>();
 }
 
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index dc2817d..64a6e9f 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -1067,10 +1067,9 @@ VclPtr<SfxTabPage> ScTabViewShell::CreatePrintOptionsPage( vcl::Window *pParent,
 {
     ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
     OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
-    ::CreateTabPage ScTpPrintOptionsCreate =    pFact->GetTabPageCreatorFunc( RID_SCPAGE_PRINT );
+    ::CreateTabPage ScTpPrintOptionsCreate = pFact->GetTabPageCreatorFunc( RID_SCPAGE_PRINT );
     if ( ScTpPrintOptionsCreate )
-        return VclPtr<SfxTabPage>((*ScTpPrintOptionsCreate)( pParent, &rOptions),
-                                  SAL_NO_ACQUIRE);
+        return ScTpPrintOptionsCreate( pParent, &rOptions );
     return VclPtr<SfxTabPage>();
 }
 
diff --git a/sw/source/uibase/sidebar/PagePropertyPanel.cxx b/sw/source/uibase/sidebar/PagePropertyPanel.cxx
index 73bf32b..0d0ac10 100644
--- a/sw/source/uibase/sidebar/PagePropertyPanel.cxx
+++ b/sw/source/uibase/sidebar/PagePropertyPanel.cxx
@@ -95,13 +95,9 @@ VclPtr<vcl::Window> PagePropertyPanel::Create (
     if (pBindings == NULL)
         throw ::com::sun::star::lang::IllegalArgumentException("no SfxBindings given to PagePropertyPanel::Create", NULL, 2);
 
-    return VclPtr<vcl::Window>(
-                VclPtr<PagePropertyPanel>::Create(
-
-                        pParent,
-                        rxFrame,
-                        pBindings),
-                SAL_NO_ACQUIRE);
+    return VclPtr<PagePropertyPanel>::Create( pParent,
+                                              rxFrame,
+                                              pBindings);
 }
 
 PagePropertyPanel::PagePropertyPanel(
diff --git a/sw/source/uibase/uiview/viewprt.cxx b/sw/source/uibase/uiview/viewprt.cxx
index 76cbdb3..012e0dd 100644
--- a/sw/source/uibase/uiview/viewprt.cxx
+++ b/sw/source/uibase/uiview/viewprt.cxx
@@ -259,9 +259,7 @@ VclPtr<SfxTabPage> CreatePrintOptionsPage( vcl::Window *pParent,
     if (!fnCreatePage)
         return NULL;
 
-    VclPtr<SfxTabPage> pPage =
-        VclPtr<SfxTabPage>((*fnCreatePage)(pParent, &rOptions),
-                           SAL_NO_ACQUIRE);
+    VclPtr<SfxTabPage> pPage = fnCreatePage(pParent, &rOptions);
     OSL_ENSURE(pPage, "No page");
     if (!pPage)
         return NULL;