[Libreoffice-commits] core.git: cppcanvas/source lotuswordpro/source sc/source sd/source ucb/source
Stephan Bergmann
sbergman at redhat.com
Wed Oct 1 09:48:37 PDT 2014
cppcanvas/source/mtfrenderer/transparencygroupaction.cxx | 4 ----
lotuswordpro/source/filter/lwppara1.cxx | 2 --
sc/source/filter/html/htmlpars.cxx | 4 ----
sc/source/ui/unoobj/servuno.cxx | 2 --
sd/source/ui/framework/factories/ChildWindowPane.cxx | 2 --
sd/source/ui/sidebar/MasterPagesSelector.cxx | 2 --
ucb/source/ucp/webdav-neon/webdavcontent.cxx | 2 --
7 files changed, 18 deletions(-)
New commits:
commit 1eb35713bc985dea2e8db7a082f03b34fd4b45d2
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Oct 1 18:44:15 2014 +0200
Remove leftover SAL_WNODEPRECATED_DECLARATIONS_PUSH/POP
...from times when code used std::auto_ptr.
Change-Id: Ia4eca8b0b95a8846886884404009e895daba8a22
diff --git a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
index a326308..fa91a85 100644
--- a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
+++ b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
@@ -144,7 +144,6 @@ namespace cppcanvas
aLocalTransformation );
}
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
TransparencyGroupAction::TransparencyGroupAction( MtfAutoPtr&& rGroupMtf,
GradientAutoPtr&& rAlphaGradient,
const Renderer::Parameters& rParms,
@@ -176,7 +175,6 @@ namespace cppcanvas
maLastSubset.mnSubsetBegin = 0;
maLastSubset.mnSubsetEnd = -1;
}
- SAL_WNODEPRECATED_DECLARATIONS_POP
// TODO(P3): The whole float transparency handling is a mess,
// this should be refactored. What's more, the old idea of
@@ -478,7 +476,6 @@ namespace cppcanvas
}
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
ActionSharedPtr TransparencyGroupActionFactory::createTransparencyGroupAction( MtfAutoPtr&& rGroupMtf,
GradientAutoPtr&& rAlphaGradient,
const Renderer::Parameters& rParms,
@@ -495,7 +492,6 @@ namespace cppcanvas
rCanvas,
rState ) );
}
- SAL_WNODEPRECATED_DECLARATIONS_POP
}
}
diff --git a/lotuswordpro/source/filter/lwppara1.cxx b/lotuswordpro/source/filter/lwppara1.cxx
index 834174f..c9a83d9 100644
--- a/lotuswordpro/source/filter/lwppara1.cxx
+++ b/lotuswordpro/source/filter/lwppara1.cxx
@@ -354,13 +354,11 @@ void LwpPara::OverrideParaBorder(LwpParaProperty* pProps, XFParaStyle* pOverStyl
}
LwpOverride* pBorder = pParaStyle->GetParaBorder();
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
boost::scoped_ptr<LwpParaBorderOverride> pFinalBorder(
pBorder
? polymorphic_downcast<LwpParaBorderOverride*>(pBorder->clone())
: new LwpParaBorderOverride)
;
- SAL_WNODEPRECATED_DECLARATIONS_POP
// get local border
pBorder = static_cast<LwpParaBorderProperty*>(pProps)->GetLocalParaBorder();
diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx
index 48e1d96..139ac8f 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -2373,7 +2373,6 @@ void ScHTMLTable::CreateNewEntry( const ImportInfo& rInfo )
mxCurrEntry->aSel = rInfo.aSelection;
}
-SAL_WNODEPRECATED_DECLARATIONS_PUSH
void ScHTMLTable::ImplPushEntryToList( ScHTMLEntryList& rEntryList, ScHTMLEntryPtr& rxEntry )
{
// HTML entry list does not own the entries
@@ -2381,9 +2380,7 @@ void ScHTMLTable::ImplPushEntryToList( ScHTMLEntryList& rEntryList, ScHTMLEntryP
// mrEEParseList (reference to member of ScEEParser) owns the entries
mrEEParseList.push_back( rxEntry.release() );
}
-SAL_WNODEPRECATED_DECLARATIONS_POP
-SAL_WNODEPRECATED_DECLARATIONS_PUSH
bool ScHTMLTable::PushEntry( ScHTMLEntryPtr& rxEntry )
{
bool bPushed = false;
@@ -2411,7 +2408,6 @@ bool ScHTMLTable::PushEntry( ScHTMLEntryPtr& rxEntry )
}
return bPushed;
}
-SAL_WNODEPRECATED_DECLARATIONS_POP
bool ScHTMLTable::PushEntry( const ImportInfo& rInfo, bool bLastInCell )
{
diff --git a/sc/source/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxx
index 0d88e64..946c3e1 100644
--- a/sc/source/ui/unoobj/servuno.cxx
+++ b/sc/source/ui/unoobj/servuno.cxx
@@ -584,9 +584,7 @@ uno::Reference<uno::XInterface> ScServiceProvider::MakeInstance(
ScAddress aAddress;
ScCompiler* pComp = new ScCompiler(&rDoc,aAddress);
pComp->SetGrammar( rDoc.GetGrammar() );
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
xRet.set(static_cast<sheet::XFormulaOpCodeMapper*>(new ScFormulaOpCodeMapperObj(::std::unique_ptr<formula::FormulaCompiler> (pComp))));
- SAL_WNODEPRECATED_DECLARATIONS_POP
break;
}
#ifndef DISABLE_SCRIPTING
diff --git a/sd/source/ui/framework/factories/ChildWindowPane.cxx b/sd/source/ui/framework/factories/ChildWindowPane.cxx
index f69ea26..7e6da77 100644
--- a/sd/source/ui/framework/factories/ChildWindowPane.cxx
+++ b/sd/source/ui/framework/factories/ChildWindowPane.cxx
@@ -36,7 +36,6 @@ using namespace ::com::sun::star::drawing::framework;
namespace sd { namespace framework {
-SAL_WNODEPRECATED_DECLARATIONS_PUSH
ChildWindowPane::ChildWindowPane (
const Reference<XResourceId>& rxPaneId,
sal_uInt16 nChildWindowId,
@@ -88,7 +87,6 @@ ChildWindowPane::ChildWindowPane (
}
}
}
-SAL_WNODEPRECATED_DECLARATIONS_POP
ChildWindowPane::~ChildWindowPane (void)
{
diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx
index b233c15..247e9f5 100644
--- a/sd/source/ui/sidebar/MasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx
@@ -686,7 +686,6 @@ void MasterPagesSelector::InvalidateItem (MasterPageContainer::Token aToken)
}
}
-SAL_WNODEPRECATED_DECLARATIONS_PUSH
void MasterPagesSelector::UpdateItemList (::std::unique_ptr<ItemList> && pNewItemList)
{
const ::osl::MutexGuard aGuard (maMutex);
@@ -724,7 +723,6 @@ void MasterPagesSelector::UpdateItemList (::std::unique_ptr<ItemList> && pNewIte
if (mxSidebar.is())
mxSidebar->requestLayout();
}
-SAL_WNODEPRECATED_DECLARATIONS_POP
css::ui::LayoutSize MasterPagesSelector::GetHeightForWidth (const sal_Int32 nWidth)
{
diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
index 84a2e6c..936de4c 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
@@ -3121,7 +3121,6 @@ void Content::cancelCommandExecution(
}
-SAL_WNODEPRECATED_DECLARATIONS_PUSH
const OUString
Content::getBaseURI( const std::unique_ptr< DAVResourceAccess > & rResAccess )
{
@@ -3235,7 +3234,6 @@ Content::ResourceType Content::getResourceType(
}
return m_eResourceType;
}
-SAL_WNODEPRECATED_DECLARATIONS_POP
Content::ResourceType Content::getResourceType(
More information about the Libreoffice-commits
mailing list