[Libreoffice-commits] core.git: 37 commits - cui/source editeng/source framework/source officecfg/registry sc/inc sc/source sd/source sfx2/source shell/source svx/source unusedcode.easy vcl/inc vcl/source
Caolán McNamara
caolanm at redhat.com
Tue Feb 25 02:45:59 PST 2014
cui/source/options/optaboutconfig.cxx | 5
cui/source/options/optaboutconfig.hxx | 1
editeng/source/editeng/impedit.hxx | 4
editeng/source/editeng/impedit2.cxx | 1
editeng/source/editeng/impedit3.cxx | 7
framework/source/services/pathsettings.cxx | 6
officecfg/registry/data/org/openoffice/Office/Paths.xcu | 14
sc/inc/docuno.hxx | 6
sc/inc/fielduno.hxx | 11
sc/inc/funcuno.hxx | 7
sc/inc/linkuno.hxx | 26 -
sc/inc/nameuno.hxx | 19
sc/inc/shapeuno.hxx | 5
sc/inc/tokenuno.hxx | 3
sc/inc/viewuno.hxx | 22 -
sc/source/ui/unoobj/docuno.cxx | 7
sc/source/ui/unoobj/fielduno.cxx | 6
sc/source/ui/unoobj/funcuno.cxx | 4
sc/source/ui/unoobj/linkuno.cxx | 21
sc/source/ui/unoobj/nameuno.cxx | 18
sc/source/ui/unoobj/shapeuno.cxx | 12
sc/source/ui/unoobj/tokenuno.cxx | 4
sc/source/ui/unoobj/viewuno.cxx | 25 -
sc/source/ui/vba/vbarange.cxx | 3
sc/source/ui/vba/vbarange.hxx | 3
sd/source/ui/framework/factories/ViewShellWrapper.cxx | 3
sd/source/ui/inc/SdUnoDrawView.hxx | 11
sd/source/ui/inc/framework/ViewShellWrapper.hxx | 4
sd/source/ui/unoidl/SdUnoDrawView.cxx | 8
sfx2/source/doc/graphhelp.cxx | 55 --
sfx2/source/doc/graphhelp.hxx | 4
shell/source/backends/desktopbe/desktopbackend.cxx | 21
shell/source/backends/gconfbe/gconfaccess.cxx | 43 +
shell/source/backends/gconfbe/gconfaccess.hxx | 1
svx/source/accessibility/svxpixelctlaccessiblecontext.cxx | 304 ++++----------
svx/source/inc/svxpixelctlaccessiblecontext.hxx | 19
unusedcode.easy | 12
vcl/inc/impimagetree.hxx | 5
vcl/source/gdi/impimagetree.cxx | 46 --
39 files changed, 303 insertions(+), 473 deletions(-)
New commits:
commit 6f48d0bb2d3f3b4e4d3e46d3a5cdeaa552df1933
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 25 09:55:48 2014 +0000
explictly list common lang-independant template dir
Change-Id: I50d8efe46fc2eb3dfe615ad1f6eb7ee03cdcd29a
diff --git a/officecfg/registry/data/org/openoffice/Office/Paths.xcu b/officecfg/registry/data/org/openoffice/Office/Paths.xcu
index 2ef605e..2a9eb5c 100644
--- a/officecfg/registry/data/org/openoffice/Office/Paths.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Paths.xcu
@@ -158,6 +158,7 @@
</node>
<node oor:name="Template" oor:op="fuse" oor:mandatory="true">
<node oor:name="InternalPaths">
+ <node oor:name="$(insturl)/@LIBO_SHARE_FOLDER@/template/common" oor:op="fuse"/>
<node oor:name="$(insturl)/@LIBO_SHARE_FOLDER@/template/$(vlang)" oor:op="fuse"/>
</node>
<!--
commit 838b77f5f3d6d8fd98891e99a23ff78a6a357cb2
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 24 11:38:13 2014 +0000
Resolves: rhbz#1065807 use xdg ~/Templates for default Template location
(if it exists)
Change-Id: I98fc9fd54d1f56c8bed24ce4d2ebf53756ded2cc
diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx
index 90d61d2..105c5a6 100644
--- a/framework/source/services/pathsettings.cxx
+++ b/framework/source/services/pathsettings.cxx
@@ -644,6 +644,12 @@ PathSettings::PathInfo PathSettings::impl_readNewFormat(const OUString& sPath)
// read the writeable path
xPath->getByName(CFGPROP_WRITEPATH) >>= aPathVal.sWritePath;
+ // avoid duplicates, by removing the writeable path from
+ // the user defined path list if it happens to be there too
+ OUStringList::iterator aI = aPathVal.lUserPaths.find(aPathVal.sWritePath);
+ if (aI != aPathVal.lUserPaths.end())
+ aPathVal.lUserPaths.erase(aI);
+
// read state props
xPath->getByName(CFGPROP_ISSINGLEPATH) >>= aPathVal.bIsSinglePath;
diff --git a/officecfg/registry/data/org/openoffice/Office/Paths.xcu b/officecfg/registry/data/org/openoffice/Office/Paths.xcu
index 4b5ec7d..2ef605e 100644
--- a/officecfg/registry/data/org/openoffice/Office/Paths.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Paths.xcu
@@ -160,8 +160,21 @@
<node oor:name="InternalPaths">
<node oor:name="$(insturl)/@LIBO_SHARE_FOLDER@/template/$(vlang)" oor:op="fuse"/>
</node>
+ <!--
+ On unix check of we have a ~/Templates and use that as the write path.
+ On other platforms, or if ~/Templates doesn't exist, use the traditional
+ $(userurl)/template path.
+
+ If we end up using the new ~/Templates as the write path, we then want
+ to have $(userurl)/template in our userpath for any templates left behind
+ in that dir.
+ -->
<prop oor:name="WritePath">
<value>$(userurl)/template</value>
+ <value install:module="unixdesktop" oor:external="com.sun.star.configuration.backend.DesktopBackend TemplatePathVariable"/>
+ </prop>
+ <prop oor:name="UserPaths">
+ <value install:module="unixdesktop">$(userurl)/template</value>
</prop>
</node>
<node oor:name="UIConfig" oor:op="fuse" oor:mandatory="true">
diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx b/shell/source/backends/desktopbe/desktopbackend.cxx
index 8233bff..0acf337 100644
--- a/shell/source/backends/desktopbe/desktopbackend.cxx
+++ b/shell/source/backends/desktopbe/desktopbackend.cxx
@@ -153,11 +153,22 @@ css::uno::Any Default::getPropertyValue(OUString const & PropertyName)
css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
css::uno::RuntimeException)
{
- if ( PropertyName == "EnableATToolSupport" || PropertyName == "ExternalMailer" || PropertyName == "SourceViewFontHeight"
- || PropertyName == "SourceViewFontName" || PropertyName == "WorkPathVariable" || PropertyName == "ooInetFTPProxyName"
- || PropertyName == "ooInetFTPProxyPort" || PropertyName == "ooInetHTTPProxyName" || PropertyName == "ooInetHTTPProxyPort"
- || PropertyName == "ooInetHTTPSProxyName" || PropertyName == "ooInetHTTPSProxyPort" || PropertyName == "ooInetNoProxy"
- || PropertyName == "ooInetProxyType" || PropertyName == "givenname" || PropertyName == "sn" )
+ if ( PropertyName == "EnableATToolSupport" ||
+ PropertyName == "ExternalMailer" ||
+ PropertyName == "SourceViewFontHeight" ||
+ PropertyName == "SourceViewFontName" ||
+ PropertyName == "TemplatePathVariable" ||
+ PropertyName == "WorkPathVariable" ||
+ PropertyName == "ooInetFTPProxyName" ||
+ PropertyName == "ooInetFTPProxyPort" ||
+ PropertyName == "ooInetHTTPProxyName" ||
+ PropertyName == "ooInetHTTPProxyPort" ||
+ PropertyName == "ooInetHTTPSProxyName" ||
+ PropertyName == "ooInetHTTPSProxyPort" ||
+ PropertyName == "ooInetNoProxy" ||
+ PropertyName == "ooInetProxyType" ||
+ PropertyName == "givenname" ||
+ PropertyName == "sn" )
{
return css::uno::makeAny(css::beans::Optional< css::uno::Any >());
}
diff --git a/shell/source/backends/gconfbe/gconfaccess.cxx b/shell/source/backends/gconfbe/gconfaccess.cxx
index 8cf9f4b..1bdad66 100644
--- a/shell/source/backends/gconfbe/gconfaccess.cxx
+++ b/shell/source/backends/gconfbe/gconfaccess.cxx
@@ -23,6 +23,7 @@
#include <string.h>
#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/Sequence.hxx"
#include "osl/file.hxx"
#include "osl/security.hxx"
#include "osl/thread.h"
@@ -189,19 +190,10 @@ static OUString xdg_user_dir_lookup (const char *type)
if( osl::FileBase::E_None == aDocumentsDir.open() )
return aDocumentsDirURL;
}
- /* Special case desktop for historical compatibility */
- if (strcmp (type, "DESKTOP") == 0)
- {
- return aHomeDirURL + "/Desktop";
- }
- else
- {
- return aHomeDirURL + "/Documents";
- }
+ /* Use fallbacks historical compatibility if nothing else exists */
+ return aHomeDirURL + "/" + OUString::createFromAscii(type);
}
-
-
uno::Any makeAnyOfGconfValue( GConfValue *pGconfValue )
{
switch( pGconfValue->type )
@@ -317,11 +309,18 @@ uno::Any translateToOOo( const ConfigurationValue &rValue, GConfValue *pGconfVal
case SETTING_WORK_DIRECTORY:
{
- OUString aDocumentsDirURL = xdg_user_dir_lookup("DOCUMENTS");
+ OUString aDocumentsDirURL = xdg_user_dir_lookup("Documents");
return uno::makeAny( aDocumentsDirURL );
}
+ case SETTING_TEMPLATE_DIRECTORY:
+ {
+ OUString aTemplatesDirURL = xdg_user_dir_lookup("Templates");
+
+ return uno::makeAny( aTemplatesDirURL );
+ }
+
case SETTING_USER_GIVENNAME:
{
OUString aCompleteName( OStringToOUString(
@@ -392,7 +391,7 @@ sal_Bool SAL_CALL isDependencySatisfied( GConfClient* pClient, const Configurati
case SETTING_WORK_DIRECTORY:
{
- OUString aDocumentsDirURL = xdg_user_dir_lookup("DOCUMENTS");
+ OUString aDocumentsDirURL = xdg_user_dir_lookup("Documents");
osl::Directory aDocumentsDir( aDocumentsDirURL );
if( osl::FileBase::E_None == aDocumentsDir.open() )
@@ -400,6 +399,16 @@ sal_Bool SAL_CALL isDependencySatisfied( GConfClient* pClient, const Configurati
}
break;
+ case SETTING_TEMPLATE_DIRECTORY:
+ {
+ OUString aTemplatesDirURL = xdg_user_dir_lookup("Templates");
+ osl::Directory aTemplatesDir( aTemplatesDirURL );
+
+ if( osl::FileBase::E_None == aTemplatesDir.open() )
+ return sal_True;
+ }
+ break;
+
case SETTING_USER_GIVENNAME:
{
OUString aCompleteName( OStringToOUString(
@@ -563,6 +572,14 @@ ConfigurationValue const ConfigurationValues[] =
},
{
+ SETTING_TEMPLATE_DIRECTORY,
+ "/desktop/gnome/url-handlers/mailto/command", // dummy
+ RTL_CONSTASCII_STRINGPARAM("TemplatePathVariable"),
+ sal_True,
+ SETTING_TEMPLATE_DIRECTORY, // so that the existence of the dir can be checked
+ },
+
+ {
SETTING_USER_GIVENNAME,
"/desktop/gnome/url-handlers/mailto/command", // dummy
RTL_CONSTASCII_STRINGPARAM("givenname"),
diff --git a/shell/source/backends/gconfbe/gconfaccess.hxx b/shell/source/backends/gconfbe/gconfaccess.hxx
index 7f0a52a..3fcd217 100644
--- a/shell/source/backends/gconfbe/gconfaccess.hxx
+++ b/shell/source/backends/gconfbe/gconfaccess.hxx
@@ -47,6 +47,7 @@ enum ConfigurationSetting
SETTING_ENABLE_ACCESSIBILITY,
SETTING_MAILER_PROGRAM,
SETTING_WORK_DIRECTORY,
+ SETTING_TEMPLATE_DIRECTORY,
SETTING_SOURCEVIEWFONT_NAME,
SETTING_SOURCEVIEWFONT_HEIGHT,
SETTING_USER_GIVENNAME,
commit 1e0541fadf847e30053c0d8b29f90bdfaecd6be6
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 25 09:08:40 2014 +0000
mrParentWindow can never be null, simplify around that
Change-Id: Id290343219044aa8e668eb8f2e58b2d3c35a2ac7
diff --git a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
index a3c797a..45a3df4 100644
--- a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
@@ -515,7 +515,7 @@ uno::Reference<XAccessible> SvxPixelCtlAccessible::CreateChild (long nIndex,Poin
sal_Bool bPixelColorOrBG= sal_Bool(mrPixelCtl.GetBitmapPixel(sal_uInt16(nIndex)));
Size size(mrPixelCtl.GetWidth() / mrPixelCtl.GetLineCount(),mrPixelCtl.GetHeight() / mrPixelCtl.GetLineCount());
uno::Reference<XAccessible> xChild;
- xChild = new SvxPixelCtlAccessibleChild(&mrPixelCtl,
+ xChild = new SvxPixelCtlAccessibleChild(mrPixelCtl,
bPixelColorOrBG,
Point(nX,nY),
Rectangle(mPoint,size),
@@ -583,7 +583,7 @@ DBG_NAME( SvxPixelCtlAccessibleChild )
SvxPixelCtlAccessibleChild::SvxPixelCtlAccessibleChild(
- SvxPixelCtl* rWindow,
+ SvxPixelCtl& rWindow,
sal_Bool bPixelColorOrBG,
const Point &aPoint,
const Rectangle& rBoundingBox,
@@ -640,8 +640,8 @@ awt::Rectangle SAL_CALL SvxPixelCtlAccessibleChild::getBounds() throw( RuntimeEx
//Modified by lq, 09/26
//return AWTRectangle( GetBoundingBox() );
awt::Rectangle rect = AWTRectangle( GetBoundingBox() );
- rect.X = rect.X + mrParentWindow->GetClientWindowExtentsRelative(NULL).Left()-mrParentWindow->GetWindowExtentsRelative(NULL).Left();
- rect.Y = rect.Y + mrParentWindow->GetClientWindowExtentsRelative(NULL).Top()-mrParentWindow->GetWindowExtentsRelative(NULL).Top();
+ rect.X = rect.X + mrParentWindow.GetClientWindowExtentsRelative(NULL).Left()-mrParentWindow.GetWindowExtentsRelative(NULL).Left();
+ rect.Y = rect.Y + mrParentWindow.GetClientWindowExtentsRelative(NULL).Top()-mrParentWindow.GetWindowExtentsRelative(NULL).Top();
return rect;
// End
}
@@ -674,7 +674,7 @@ sal_Int32 SvxPixelCtlAccessibleChild::getForeground( )
//::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
::osl::MutexGuard aGuard( m_aMutex );
ThrowExceptionIfNotAlive();
- return mrParentWindow->GetControlForeground().GetColor();
+ return mrParentWindow.GetControlForeground().GetColor();
}
sal_Int32 SvxPixelCtlAccessibleChild::getBackground( )
throw (::com::sun::star::uno::RuntimeException)
@@ -683,7 +683,7 @@ sal_Int32 SvxPixelCtlAccessibleChild::getBackground( )
::osl::MutexGuard aGuard( m_aMutex );
ThrowExceptionIfNotAlive();
- return mrParentWindow->GetControlBackground().GetColor();
+ return mrParentWindow.GetControlBackground().GetColor();
}
//===== XAccessibleContext ==================================================
@@ -750,17 +750,14 @@ uno::Reference< XAccessibleStateSet > SAL_CALL SvxPixelCtlAccessibleChild::getAc
pStateSetHelper->AddState( AccessibleStateType::SHOWING );
pStateSetHelper->AddState( AccessibleStateType::VISIBLE );
- if (mrParentWindow )
+ long nIndex = mrParentWindow.GetFoucsPosIndex();
+ if ( nIndex == mnIndexInParent)
{
- long nIndex = mrParentWindow->GetFoucsPosIndex();
- if ( nIndex == mnIndexInParent)
- {
- pStateSetHelper->AddState( AccessibleStateType::SELECTED );
- }
- if (mrParentWindow->GetBitmapPixel(sal_uInt16(mnIndexInParent)))
- {
- pStateSetHelper->AddState( AccessibleStateType::CHECKED );
- }
+ pStateSetHelper->AddState( AccessibleStateType::SELECTED );
+ }
+ if (mrParentWindow.GetBitmapPixel(sal_uInt16(mnIndexInParent)))
+ {
+ pStateSetHelper->AddState( AccessibleStateType::CHECKED );
}
}
else
@@ -881,7 +878,7 @@ Rectangle SvxPixelCtlAccessibleChild::GetBoundingBoxOnScreen( void ) throw( Runt
// no ThrowExceptionIfNotAlive() because its done in GetBoundingBox()
Rectangle aRect( GetBoundingBox() );
- return Rectangle( mrParentWindow->OutputToAbsoluteScreenPixel( aRect.TopLeft() ), aRect.GetSize() );
+ return Rectangle( mrParentWindow.OutputToAbsoluteScreenPixel( aRect.TopLeft() ), aRect.GetSize() );
}
Rectangle SvxPixelCtlAccessibleChild::GetBoundingBox( void ) throw( RuntimeException )
@@ -894,8 +891,8 @@ Rectangle SvxPixelCtlAccessibleChild::GetBoundingBox( void ) throw( RuntimeExcep
OUString SvxPixelCtlAccessibleChild::GetName()
{
- sal_Int32 nXIndex = mnIndexInParent % mrParentWindow->GetLineCount();
- sal_Int32 nYIndex = mnIndexInParent / mrParentWindow->GetLineCount();
+ sal_Int32 nXIndex = mnIndexInParent % mrParentWindow.GetLineCount();
+ sal_Int32 nYIndex = mnIndexInParent / mrParentWindow.GetLineCount();
OUString str;
str += "(";
diff --git a/svx/source/inc/svxpixelctlaccessiblecontext.hxx b/svx/source/inc/svxpixelctlaccessiblecontext.hxx
index 05e80a1..2c887b7 100644
--- a/svx/source/inc/svxpixelctlaccessiblecontext.hxx
+++ b/svx/source/inc/svxpixelctlaccessiblecontext.hxx
@@ -67,7 +67,7 @@ class SvxPixelCtlAccessibleChild :
public ::comphelper::OBaseMutex,
public SvxPixelCtlAccessibleChild_BASE
{
- SvxPixelCtl* mrParentWindow;
+ SvxPixelCtl& mrParentWindow;
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > mxParent;
void IsValid() throw (::com::sun::star::uno::RuntimeException);
sal_Bool m_bPixelColorOrBG;//Pixel Color Or BackGround Color
@@ -79,7 +79,7 @@ class SvxPixelCtlAccessibleChild :
::osl::Mutex m_aMutex;
public:
SvxPixelCtlAccessibleChild(
- SvxPixelCtl* rWindow,
+ SvxPixelCtl& rWindow,
sal_Bool bPixelColorOrBG,
const Point& aPoint,
const Rectangle& rBounds,
commit 82aaa22ea43d4a4a51f9177604094452da65d124
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 25 09:04:59 2014 +0000
pPixelCtl can never be null, which simplifies this a lot
Change-Id: Ic1c995794faa682001b472053ae9aebf95f0343b
diff --git a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
index cd2fd90..a3c797a 100644
--- a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
@@ -55,7 +55,7 @@ using namespace ::com::sun::star::accessibility;
SvxPixelCtlAccessible::SvxPixelCtlAccessible( SvxPixelCtl& rControl) :
SvxPixelCtlAccessible_BASE(m_aMutex),
- pPixelCtl(&rControl),
+ mrPixelCtl(rControl),
mnClientId(0)
{
}
@@ -80,13 +80,7 @@ uno::Reference< XAccessibleContext > SvxPixelCtlAccessible::getAccessibleContext
sal_Int32 SvxPixelCtlAccessible::getAccessibleChildCount( ) throw (uno::RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
- IsValid();
- if(pPixelCtl)
- {
- return pPixelCtl->GetSquares();
- }
- else
- return 0;
+ return mrPixelCtl.GetSquares();
}
/*-- 04.02.2002 14:11:56---------------------------------------------------
@@ -95,16 +89,10 @@ uno::Reference< XAccessible > SvxPixelCtlAccessible::getAccessibleChild( sal_Int
throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
- IsValid();
if ( i < 0 || i >= getAccessibleChildCount())
throw lang::IndexOutOfBoundsException();
uno::Reference <XAccessible> xAcc;
- if(pPixelCtl)
- {
- return CreateChild(i, pPixelCtl->IndexToPoint(i));
- }
- else
- return xAcc;
+ return CreateChild(i, mrPixelCtl.IndexToPoint(i));
}
@@ -113,27 +101,19 @@ uno::Reference< XAccessible > SvxPixelCtlAccessible::getAccessibleParent( )
throw (uno::RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
- IsValid();
- uno::Reference< XAccessible > xRet;
- if(pPixelCtl)
- xRet = pPixelCtl->GetParent()->GetAccessible( true );
- return xRet;
+ return mrPixelCtl.GetParent()->GetAccessible( true );
}
sal_Int32 SvxPixelCtlAccessible::getAccessibleIndexInParent( )
throw (uno::RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
- IsValid();
sal_uInt16 nIdx = 0;
- if(pPixelCtl)
- {
- Window* pTabPage = pPixelCtl->GetParent();
- sal_uInt16 nChildren = pTabPage->GetChildCount();
- for(nIdx = 0; nIdx < nChildren; nIdx++)
- if(pTabPage->GetChild( nIdx ) == pPixelCtl)
- break;
- }
+ Window* pTabPage = mrPixelCtl.GetParent();
+ sal_uInt16 nChildren = pTabPage->GetChildCount();
+ for(nIdx = 0; nIdx < nChildren; nIdx++)
+ if(pTabPage->GetChild( nIdx ) == &mrPixelCtl)
+ break;
return nIdx;
}
/*-- 04.02.2002 14:11:57---------------------------------------------------
@@ -149,11 +129,7 @@ OUString SvxPixelCtlAccessible::getAccessibleDescription( )
{
::osl::MutexGuard aGuard( m_aMutex );
- IsValid();
- if(pPixelCtl)
- return pPixelCtl->GetAccessibleDescription();
- else
- return OUString();
+ return mrPixelCtl.GetAccessibleDescription();
}
OUString SvxPixelCtlAccessible::getAccessibleName( )
@@ -161,42 +137,31 @@ OUString SvxPixelCtlAccessible::getAccessibleName( )
{
::osl::MutexGuard aGuard( m_aMutex );
- IsValid();
- if(pPixelCtl)
- return pPixelCtl->GetAccessibleName();
- else
- return OUString();
+ return mrPixelCtl.GetAccessibleName();
}
uno::Reference< XAccessibleRelationSet > SvxPixelCtlAccessible::getAccessibleRelationSet( )
throw (uno::RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
- IsValid();
- Window* pWindow = (Window*)pPixelCtl;
utl::AccessibleRelationSetHelper* rRelationSet = new utl::AccessibleRelationSetHelper;
uno::Reference< css::accessibility::XAccessibleRelationSet > rSet = rRelationSet;
- if ( pWindow )
+ Window *pLabeledBy = mrPixelCtl.GetAccessibleRelationLabeledBy();
+ if ( pLabeledBy && pLabeledBy != &mrPixelCtl )
{
- Window *pLabeledBy = pWindow->GetAccessibleRelationLabeledBy();
- if ( pLabeledBy && pLabeledBy != pWindow )
- {
- uno::Sequence< uno::Reference< uno::XInterface > > aSequence(1);
- aSequence[0] = pLabeledBy->GetAccessible();
- rRelationSet->AddRelation( css::accessibility::AccessibleRelation( css::accessibility::AccessibleRelationType::LABELED_BY, aSequence ) );
- }
-
- Window* pMemberOf = pWindow->GetAccessibleRelationMemberOf();
- if ( pMemberOf && pMemberOf != pWindow )
- {
- uno::Sequence< uno::Reference< uno::XInterface > > aSequence(1);
- aSequence[0] = pMemberOf->GetAccessible();
- rRelationSet->AddRelation( css::accessibility::AccessibleRelation( css::accessibility::AccessibleRelationType::MEMBER_OF, aSequence ) );
- }
- return rSet;
+ uno::Sequence< uno::Reference< uno::XInterface > > aSequence(1);
+ aSequence[0] = pLabeledBy->GetAccessible();
+ rRelationSet->AddRelation( css::accessibility::AccessibleRelation( css::accessibility::AccessibleRelationType::LABELED_BY, aSequence ) );
}
- return new utl::AccessibleRelationSetHelper;
+ Window* pMemberOf = mrPixelCtl.GetAccessibleRelationMemberOf();
+ if ( pMemberOf && pMemberOf != &mrPixelCtl )
+ {
+ uno::Sequence< uno::Reference< uno::XInterface > > aSequence(1);
+ aSequence[0] = pMemberOf->GetAccessible();
+ rRelationSet->AddRelation( css::accessibility::AccessibleRelation( css::accessibility::AccessibleRelationType::MEMBER_OF, aSequence ) );
+ }
+ return rSet;
}
@@ -207,30 +172,27 @@ uno::Reference< XAccessibleStateSet > SvxPixelCtlAccessible::getAccessibleStateS
utl::AccessibleStateSetHelper* pStateSetHelper = new utl::AccessibleStateSetHelper;
uno::Reference< XAccessibleStateSet > xRet = pStateSetHelper;
- if(!pPixelCtl)
- pStateSetHelper->AddState(AccessibleStateType::DEFUNC);
- else
+ const sal_Int16 aStandardStates[] =
{
- const sal_Int16 aStandardStates[] =
- {
- AccessibleStateType::FOCUSABLE,
- AccessibleStateType::SELECTABLE,
- AccessibleStateType::SHOWING,
- AccessibleStateType::VISIBLE,
- AccessibleStateType::OPAQUE,
- 0};
-
- sal_Int16 nState = 0;
- while(aStandardStates[nState])
- {
- pStateSetHelper->AddState(aStandardStates[nState++]);
- }
- if(pPixelCtl->IsEnabled())
- pStateSetHelper->AddState(AccessibleStateType::ENABLED);
- if(pPixelCtl->HasFocus())
- pStateSetHelper->AddState(AccessibleStateType::FOCUSED);
- pStateSetHelper->AddState(AccessibleStateType::MANAGES_DESCENDANTS);
+ AccessibleStateType::FOCUSABLE,
+ AccessibleStateType::SELECTABLE,
+ AccessibleStateType::SHOWING,
+ AccessibleStateType::VISIBLE,
+ AccessibleStateType::OPAQUE,
+ 0
+ };
+
+ sal_Int16 nState = 0;
+ while(aStandardStates[nState])
+ {
+ pStateSetHelper->AddState(aStandardStates[nState++]);
}
+ if(mrPixelCtl.IsEnabled())
+ pStateSetHelper->AddState(AccessibleStateType::ENABLED);
+ if(mrPixelCtl.HasFocus())
+ pStateSetHelper->AddState(AccessibleStateType::FOCUSED);
+ pStateSetHelper->AddState(AccessibleStateType::MANAGES_DESCENDANTS);
+
return xRet;
}
@@ -256,15 +218,11 @@ sal_Bool SvxPixelCtlAccessible::containsPoint( const awt::Point& aPt )
throw (uno::RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
- IsValid();
Point aPoint(aPt.X, aPt.Y);
- if(pPixelCtl)
- return (aPoint.X() >= 0)
- && (aPoint.X() < pPixelCtl->GetSizePixel().getWidth())
- && (aPoint.Y() >= 0)
- && (aPoint.Y() < pPixelCtl->GetSizePixel().getHeight());
- else
- return sal_False;
+ return (aPoint.X() >= 0)
+ && (aPoint.X() < mrPixelCtl.GetSizePixel().getWidth())
+ && (aPoint.Y() >= 0)
+ && (aPoint.Y() < mrPixelCtl.GetSizePixel().getHeight());
}
uno::Reference<XAccessible > SAL_CALL SvxPixelCtlAccessible::getAccessibleAtPoint (
const awt::Point& aPoint)
@@ -278,42 +236,29 @@ uno::Reference<XAccessible > SAL_CALL SvxPixelCtlAccessible::getAccessibleAtPoin
childPoint.X() = aPoint.X;
childPoint.Y() = aPoint.Y;
- if(pPixelCtl)
- {
- Point pt= pPixelCtl->PixelToLogic(childPoint);
- long nIndex = pPixelCtl->PointToIndex(pt);
- return CreateChild(nIndex,pPixelCtl->IndexToPoint(nIndex));
- }
- else
- return xAcc;
-
+ Point pt= mrPixelCtl.PixelToLogic(childPoint);
+ long nIndex = mrPixelCtl.PointToIndex(pt);
+ return CreateChild(nIndex, mrPixelCtl.IndexToPoint(nIndex));
}
awt::Rectangle SvxPixelCtlAccessible::getBounds( ) throw (uno::RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
- IsValid();
- Size aSz;
- Point aPos(0,0);
awt::Rectangle aRet;
- if(pPixelCtl)
- {
- aSz = pPixelCtl->GetSizePixel();
- aPos = pPixelCtl->GetPosPixel();
- aRet.X = aPos.X();
- aRet.Y = aPos.Y();
- aRet.Width = aSz.Width();
- aRet.Height = aSz.Height();
- }
+ Size aSz = mrPixelCtl.GetSizePixel();
+ Point aPos = mrPixelCtl.GetPosPixel();
+ aRet.X = aPos.X();
+ aRet.Y = aPos.Y();
+ aRet.Width = aSz.Width();
+ aRet.Height = aSz.Height();
return aRet;
}
awt::Point SvxPixelCtlAccessible::getLocation( ) throw (uno::RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
- IsValid();
Point aPos;
- aPos = pPixelCtl->GetPosPixel();
+ aPos = mrPixelCtl.GetPosPixel();
awt::Point aRet(aPos.X(), aPos.Y());
return aRet;
}
@@ -321,44 +266,34 @@ awt::Point SvxPixelCtlAccessible::getLocation( ) throw (uno::RuntimeException)
awt::Point SvxPixelCtlAccessible::getLocationOnScreen( ) throw (uno::RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
- IsValid();
- Rectangle rect;
- rect = pPixelCtl->GetWindowExtentsRelative(NULL);
- awt::Point aRet(rect.Left(),rect.Top() );
- return aRet;
+ Rectangle rect = mrPixelCtl.GetWindowExtentsRelative(NULL);
+ return awt::Point(rect.Left(),rect.Top() );
}
awt::Size SvxPixelCtlAccessible::getSize( ) throw (uno::RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
- IsValid();
- Size aSz;
- aSz = pPixelCtl->GetSizePixel();
- awt::Size aRet(aSz.Width(),aSz.Height());
- return aRet;
+ Size aSz = mrPixelCtl.GetSizePixel();
+ return awt::Size(aSz.Width(),aSz.Height());
}
void SvxPixelCtlAccessible::grabFocus( ) throw (uno::RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
- IsValid();
- if(pPixelCtl)
- pPixelCtl->GrabFocus();
+ mrPixelCtl.GrabFocus();
}
sal_Int32 SvxPixelCtlAccessible::getForeground( )
throw (::com::sun::star::uno::RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
- IsValid();
- return pPixelCtl->GetControlForeground().GetColor();
+ return mrPixelCtl.GetControlForeground().GetColor();
}
sal_Int32 SvxPixelCtlAccessible::getBackground( )
throw (::com::sun::star::uno::RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
- IsValid();
- return pPixelCtl->GetControlBackground().GetColor();
+ return mrPixelCtl.GetControlBackground().GetColor();
}
OUString SvxPixelCtlAccessible::getImplementationName( ) throw (uno::RuntimeException)
@@ -389,12 +324,11 @@ uno::Sequence< OUString > SvxPixelCtlAccessible::getSupportedServiceNames( )
void SAL_CALL SvxPixelCtlAccessible::selectAccessibleChild( sal_Int32 nChildIndex ) throw (lang::IndexOutOfBoundsException, RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
- IsValid();
if ( nChildIndex < 0 || nChildIndex >= getAccessibleChildCount())
throw lang::IndexOutOfBoundsException();
- long nIndex = pPixelCtl->ShowPosition(pPixelCtl->IndexToPoint(nChildIndex));
+ long nIndex = mrPixelCtl.ShowPosition(mrPixelCtl.IndexToPoint(nChildIndex));
NotifyChild(nIndex,sal_True,sal_False);
}
@@ -402,33 +336,19 @@ sal_Bool SAL_CALL SvxPixelCtlAccessible::isAccessibleChildSelected( sal_Int32 nC
{
::osl::MutexGuard aGuard( m_aMutex );
- IsValid();
-
- return pPixelCtl->GetFoucsPosIndex() == nChildIndex;
+ return mrPixelCtl.GetFoucsPosIndex() == nChildIndex;
}
void SAL_CALL SvxPixelCtlAccessible::clearAccessibleSelection( ) throw (RuntimeException)
{
- ::osl::MutexGuard aGuard( m_aMutex );
-
- IsValid();
-
}
void SAL_CALL SvxPixelCtlAccessible::selectAllAccessibleChildren( ) throw (RuntimeException)
{
- ::osl::MutexGuard aGuard( m_aMutex );
-
- IsValid();
-
}
sal_Int32 SAL_CALL SvxPixelCtlAccessible::getSelectedAccessibleChildCount( ) throw (RuntimeException)
{
- ::osl::MutexGuard aGuard( m_aMutex );
-
- IsValid();
-
return 1;
}
@@ -436,29 +356,19 @@ uno::Reference< XAccessible > SAL_CALL SvxPixelCtlAccessible::getSelectedAccessi
{
::osl::MutexGuard aGuard( m_aMutex );
- IsValid();
-
if ( nSelectedChildIndex >= 1)
throw lang::IndexOutOfBoundsException();
uno::Reference< XAccessible > xChild;
- if(pPixelCtl)
+ if(m_xCurChild.is())
{
- if(m_xCurChild.is())
- {
- xChild = m_xCurChild;
- }
+ xChild = m_xCurChild;
}
return xChild;
}
void SAL_CALL SvxPixelCtlAccessible::deselectAccessibleChild( sal_Int32 ) throw (lang::IndexOutOfBoundsException, RuntimeException)
{
- ::osl::MutexGuard aGuard( m_aMutex );
-
- IsValid();
-
-
}
// Added by lq
@@ -472,7 +382,7 @@ void SvxPixelCtlAccessible::ensureIsAlive() const
void SvxPixelCtlAccessible::ensureIsValidRow( sal_Int32 nRow )
throw ( lang::IndexOutOfBoundsException )
{
- if( nRow >= pPixelCtl->GetHeight() || nRow <0)
+ if( nRow >= mrPixelCtl.GetHeight() || nRow <0)
throw lang::IndexOutOfBoundsException(
OUString( RTL_CONSTASCII_USTRINGPARAM( "row index is invalid" ) ), *this );
}
@@ -480,7 +390,7 @@ void SvxPixelCtlAccessible::ensureIsValidRow( sal_Int32 nRow )
void SvxPixelCtlAccessible::ensureIsValidColumn( sal_Int32 nColumn )
throw ( lang::IndexOutOfBoundsException )
{
- if( nColumn >= pPixelCtl->GetWidth() || nColumn <0 )
+ if( nColumn >= mrPixelCtl.GetWidth() || nColumn <0 )
throw lang::IndexOutOfBoundsException(
OUString( RTL_CONSTASCII_USTRINGPARAM("column index is invalid") ), *this );
}
@@ -542,13 +452,6 @@ void SAL_CALL SvxPixelCtlAccessible::disposing()
}
}
-void SvxPixelCtlAccessible::IsValid() throw (uno::RuntimeException)
-{
- if(!pPixelCtl)
- throw uno::RuntimeException();
-}
-
-
void SvxPixelCtlAccessible::NotifyChild(long nIndex,sal_Bool bSelect ,sal_Bool bCheck)
{
DBG_ASSERT( !(!bSelect && !bCheck),"" );//non is false
@@ -567,13 +470,13 @@ void SvxPixelCtlAccessible::NotifyChild(long nIndex,sal_Bool bSelect ,sal_Bool b
}
if (bCheck)
{
- pChild->ChangePixelColorOrBG(sal_Bool(pPixelCtl->GetBitmapPixel(sal_uInt16(nIndex))));
+ pChild->ChangePixelColorOrBG(sal_Bool(mrPixelCtl.GetBitmapPixel(sal_uInt16(nIndex))));
pChild->CheckChild();
}
return ;
}
}
- uno::Reference <XAccessible> xNewChild =CreateChild(nIndex, pPixelCtl->IndexToPoint(nIndex));
+ uno::Reference <XAccessible> xNewChild =CreateChild(nIndex, mrPixelCtl.IndexToPoint(nIndex));
SvxPixelCtlAccessibleChild *pNewChild= static_cast<SvxPixelCtlAccessibleChild*>(xNewChild.get());
DBG_ASSERT(pNewChild,"Child Must be Valid");
@@ -606,13 +509,13 @@ uno::Reference<XAccessible> SvxPixelCtlAccessible::CreateChild (long nIndex,Poin
long nY = mPoint.Y();
if( Application::GetSettings().GetLayoutRTL())
{
- nX = (sal_uInt16) pPixelCtl->GetWidth() - 1 - nX;
+ nX = (sal_uInt16) mrPixelCtl.GetWidth() - 1 - nX;
}
- sal_Bool bPixelColorOrBG= sal_Bool(pPixelCtl->GetBitmapPixel(sal_uInt16(nIndex)));
- Size size(pPixelCtl->GetWidth() / pPixelCtl->GetLineCount(),pPixelCtl->GetHeight() / pPixelCtl->GetLineCount());
+ sal_Bool bPixelColorOrBG= sal_Bool(mrPixelCtl.GetBitmapPixel(sal_uInt16(nIndex)));
+ Size size(mrPixelCtl.GetWidth() / mrPixelCtl.GetLineCount(),mrPixelCtl.GetHeight() / mrPixelCtl.GetLineCount());
uno::Reference<XAccessible> xChild;
- xChild = new SvxPixelCtlAccessibleChild(pPixelCtl,
+ xChild = new SvxPixelCtlAccessibleChild(&mrPixelCtl,
bPixelColorOrBG,
Point(nX,nY),
Rectangle(mPoint,size),
diff --git a/svx/source/inc/svxpixelctlaccessiblecontext.hxx b/svx/source/inc/svxpixelctlaccessiblecontext.hxx
index 36c797c..05e80a1 100644
--- a/svx/source/inc/svxpixelctlaccessiblecontext.hxx
+++ b/svx/source/inc/svxpixelctlaccessiblecontext.hxx
@@ -170,8 +170,7 @@ class SvxPixelCtlAccessible :
public ::comphelper::OBaseMutex,
public SvxPixelCtlAccessible_BASE
{
- SvxPixelCtl* pPixelCtl;
- void IsValid() throw (::com::sun::star::uno::RuntimeException);
+ SvxPixelCtl& mrPixelCtl;
public:
SvxPixelCtlAccessible(SvxPixelCtl& rWindow);
commit 58ba105a0328a932ff3dd86b043a909d01dacf5d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 25 08:53:25 2014 +0000
callcatcher: update unused code
Change-Id: Ia8e6abffb85b92ee4538fb0aeaee4e4aa18f2772
diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx
index 18981dd..6e0a0f3 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -458,11 +458,6 @@ CuiAboutConfigValueDialog::CuiAboutConfigValueDialog( Window* pWindow,
}
-IMPL_LINK( CuiAboutConfigTabPage, HeaderSelect_Impl, HeaderBar*, /*pBar*/ )
-{
- return 0;
-}
-
IMPL_LINK_NOARG( CuiAboutConfigTabPage, ResetBtnHdl_Impl )
{
Reset();
diff --git a/cui/source/options/optaboutconfig.hxx b/cui/source/options/optaboutconfig.hxx
index 7d6017d..0f80272 100644
--- a/cui/source/options/optaboutconfig.hxx
+++ b/cui/source/options/optaboutconfig.hxx
@@ -53,7 +53,6 @@ private:
void AddToModifiedVector( const boost::shared_ptr< Prop_Impl >& rProp );
std::vector< OUString > commaStringToSequence( const OUString& rCommaSepString );
- DECL_LINK( HeaderSelect_Impl, HeaderBar * );
DECL_LINK( StandardHdl_Impl, void * );
DECL_LINK( ResetBtnHdl_Impl, void * );
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index 46516bd..d644265 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -491,7 +491,6 @@ private:
bool bInSelection:1;
bool bIsInUndo:1;
bool bUpdate:1;
- bool bUpdateForAcc:1;
bool bUndoEnabled:1;
bool bOwnerOfRefDev:1;
bool bDowning:1;
@@ -696,9 +695,6 @@ public:
void SetUpdateMode( bool bUp, EditView* pCurView = 0, sal_Bool bForceUpdate = sal_False );
bool GetUpdateMode() const { return bUpdate; }
- void SetUpdateModeForAcc(bool bUp);
- bool GetUpdateModeForAcc() const { return bUpdateForAcc; }
-
ViewsType& GetEditViews() { return aEditViews; }
const ViewsType& GetEditViews() const { return aEditViews; }
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index db8da11..06a7f52 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -93,7 +93,6 @@ ImpEditEngine::ImpEditEngine( EditEngine* pEE, SfxItemPool* pItemPool ) :
bInSelection(false),
bIsInUndo(false),
bUpdate(true),
- bUpdateForAcc(true),
bUndoEnabled(true),
bOwnerOfRefDev(false),
bDowning(false),
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index ab8c3d8..6539762 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -364,7 +364,7 @@ void ImpEditEngine::FormatFullDoc()
void ImpEditEngine::FormatDoc()
{
- if (!GetUpdateMode() || IsFormatting() || !GetUpdateModeForAcc())
+ if (!GetUpdateMode() || IsFormatting())
return;
EnterBlockNotifications();
@@ -3857,11 +3857,6 @@ void ImpEditEngine::InsertContent( ContentNode* pNode, sal_Int32 nPos )
GetEditEnginePtr()->ParagraphInserted( nPos );
}
-void ImpEditEngine::SetUpdateModeForAcc(bool bUp)
-{
- bUpdateForAcc = bUp;
-}
-
EditPaM ImpEditEngine::SplitContent( sal_Int32 nNode, sal_Int32 nSepPos )
{
ContentNode* pNode = aEditDoc.GetObject( nNode );
diff --git a/sfx2/source/doc/graphhelp.cxx b/sfx2/source/doc/graphhelp.cxx
index 6a6597d..60329d0 100644
--- a/sfx2/source/doc/graphhelp.cxx
+++ b/sfx2/source/doc/graphhelp.cxx
@@ -206,61 +206,6 @@ sal_Bool GraphicHelper::supportsMetaFileHandle_Impl()
// static
-sal_Bool GraphicHelper::mergeBitmaps_Impl( const BitmapEx& rBmpEx, const BitmapEx& rOverlay,
- const Rectangle& rOverlayRect, BitmapEx& rReturn )
-{
- // the implementation is provided by KA
-
- Point aNullPt;
- Rectangle aBmpRect( aNullPt, rBmpEx.GetSizePixel() );
- VirtualDevice aVDev;
-
- if( !rReturn.IsEmpty() )
- rReturn.SetEmpty();
-
- if( !rBmpEx.IsEmpty() && aVDev.SetOutputSizePixel( aBmpRect.GetSize() ) )
- {
- Rectangle aOverlayRect( rOverlayRect );
-
- aOverlayRect.Intersection( aBmpRect );
-
- if( rOverlay.IsEmpty() || rOverlayRect.IsEmpty() )
- rReturn = rBmpEx;
- else
- {
- aVDev.DrawBitmap( aNullPt, aVDev.GetOutputSizePixel(), rBmpEx.GetBitmap() );
- aVDev.DrawBitmapEx( aOverlayRect.TopLeft(), aOverlayRect.GetSize(), rOverlay );
-
- Bitmap aBmp( aVDev.GetBitmap( aNullPt, aVDev.GetOutputSizePixel() ) );
- aBmp.Convert( BMP_CONVERSION_24BIT );
-
- if( !rBmpEx.IsTransparent() )
- rReturn = aBmp;
- else
- {
- aVDev.DrawBitmap( aNullPt, aVDev.GetOutputSizePixel(), rBmpEx.GetMask() );
- Bitmap aOverlayMergeBmp( aVDev.GetBitmap( aOverlayRect.TopLeft(), aOverlayRect.GetSize() ) );
-
- if( rOverlay.IsTransparent() )
- aVDev.DrawBitmap( aOverlayRect.TopLeft(), aOverlayRect.GetSize(), rOverlay.GetMask() );
- else
- {
- aVDev.SetLineColor( COL_BLACK );
- aVDev.SetFillColor( COL_BLACK );
- aVDev.DrawRect( aOverlayRect);
- }
-
- aOverlayMergeBmp.CombineSimple( aVDev.GetBitmap( aOverlayRect.TopLeft(), aOverlayRect.GetSize() ), BMP_COMBINE_AND );
- aVDev.DrawBitmap( aOverlayRect.TopLeft(), aOverlayRect.GetSize(), aOverlayMergeBmp );
- rReturn = BitmapEx( aBmp, aVDev.GetBitmap( aNullPt, aVDev.GetOutputSizePixel() ) );
- }
- }
- }
-
- return !rReturn.IsEmpty();
-}
-
-// static
sal_Bool GraphicHelper::getThumbnailFormatFromGDI_Impl( GDIMetaFile* pMetaFile,
const uno::Reference< io::XStream >& xStream )
{
diff --git a/sfx2/source/doc/graphhelp.hxx b/sfx2/source/doc/graphhelp.hxx
index 8acec37..f9beede 100644
--- a/sfx2/source/doc/graphhelp.hxx
+++ b/sfx2/source/doc/graphhelp.hxx
@@ -30,10 +30,6 @@ class BitmapEx;
class GraphicHelper
{
-
- static sal_Bool mergeBitmaps_Impl( const BitmapEx& rBmpEx, const BitmapEx& rOverlay,
- const Rectangle& rOverlayRect, BitmapEx& rReturn );
-
public:
static SvMemoryStream* getFormatStrFromGDI_Impl( const GDIMetaFile* pGDIMeta, sal_uInt32 nFormat );
diff --git a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
index f4926b9..cd2fd90 100644
--- a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
@@ -485,23 +485,6 @@ void SvxPixelCtlAccessible::ensureIsValidColumn( sal_Int32 nColumn )
OUString( RTL_CONSTASCII_USTRINGPARAM("column index is invalid") ), *this );
}
-void SvxPixelCtlAccessible::ensureIsValidAddress(
- sal_Int32 nRow, sal_Int32 nColumn )
- throw ( lang::IndexOutOfBoundsException )
-{
- ensureIsValidRow( nRow );
- ensureIsValidColumn( nColumn );
-}
-
-void SvxPixelCtlAccessible::ensureIsValidIndex( sal_Int32 nChildIndex )
- throw ( lang::IndexOutOfBoundsException )
-{
- if( nChildIndex >= pPixelCtl->GetSquares())
- throw lang::IndexOutOfBoundsException(
- OUString( RTL_CONSTASCII_USTRINGPARAM("child index is invalid") ), *this );
-}
-
-
//XAccessibleEventBroadcaster
void SAL_CALL SvxPixelCtlAccessible::addAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) throw( RuntimeException )
{
@@ -559,11 +542,6 @@ void SAL_CALL SvxPixelCtlAccessible::disposing()
}
}
-void SvxPixelCtlAccessible::Invalidate()
-{
- pPixelCtl = 0;
-}
-
void SvxPixelCtlAccessible::IsValid() throw (uno::RuntimeException)
{
if(!pPixelCtl)
diff --git a/svx/source/inc/svxpixelctlaccessiblecontext.hxx b/svx/source/inc/svxpixelctlaccessiblecontext.hxx
index 23172d1..36c797c 100644
--- a/svx/source/inc/svxpixelctlaccessiblecontext.hxx
+++ b/svx/source/inc/svxpixelctlaccessiblecontext.hxx
@@ -244,7 +244,6 @@ public:
void LoseFocus();
- void Invalidate();
/// @returns true if it's disposed or in disposing
inline sal_Bool IsAlive( void ) const;
/// @returns true if it's not disposed and no in disposing
@@ -261,17 +260,6 @@ protected:
If the specified column index is invalid. */
void ensureIsValidColumn( sal_Int32 nColumn )
throw ( ::com::sun::star::lang::IndexOutOfBoundsException );
- /** @attention This method requires locked mutex's and a living object.
- @throws <type>IndexOutOfBoundsException</type>
- If the specified cell address is invalid. */
- void ensureIsValidAddress( sal_Int32 nRow, sal_Int32 nColumn )
- throw ( ::com::sun::star::lang::IndexOutOfBoundsException );
- /** @attention This method requires locked mutex's and a living object.
- @throws <type>IndexOutOfBoundsException</type>
- If the specified child index is invalid. */
- void ensureIsValidIndex( sal_Int32 nChildIndex )
- throw ( ::com::sun::star::lang::IndexOutOfBoundsException );
-
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> m_xCurChild;
public:
diff --git a/unusedcode.easy b/unusedcode.easy
index d02ca32..de0b159 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -3,15 +3,11 @@ BigInt::BigInt(unsigned int)
BigInt::GetString() const
CalcUnoApiTest::CalcUnoApiTest(rtl::OUString const&)
Chart2ExportTest::testFdo74115WallGradientFill()
-Chart2ImportTest::testODPChartSeries()
-Chart2ImportTest::testPPTChartSeries()
-Chart2ImportTest::testPPTXChartSeries()
CodeCompleteDataCache::GetVars() const
CodeCompleteDataCache::SetVars(boost::unordered::unordered_map<rtl::OUString, boost::unordered::unordered_map<rtl::OUString, rtl::OUString, rtl::OUStringHash, std::equal_to<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, rtl::OUString> > >, rtl::OUStringHash, std::equal_to<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, boost::unordered::unordered_map<rtl::OUString, rtl::OUString, rtl::OUStringHash, std::equal_to<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, rtl::OUString> > > > > > const&)
CodeCompleteDataCache::print() const
ComboBox::GetMRUCount() const
ConfigurationAccess::getPath(rtl::OUString const&)
-CuiAboutConfigTabPage::LinkStubHeaderSelect_Impl(void*, void*)
DocxSdrExport::setFrameBtLr(bool)
EditEngine::IsIdleFormatterActive() const
EditSelection::IsInvalid() const
@@ -26,8 +22,7 @@ GDriveDocument::GDriveDocument(GDriveSession*)
GDriveFolder::GDriveFolder(GDriveSession*)
GDriveProperty::GDriveProperty()
GDriveSession::GDriveSession()
-GraphicHelper::mergeBitmaps_Impl(BitmapEx const&, BitmapEx const&, Rectangle const&, BitmapEx&)
-ImpEditEngine::SetUpdateModeForAcc(bool)
+ImplImageTree::checkStyle(rtl::OUString const&)
ImplRegionBand::IsInside(long, long)
ImplRegionBand::IsOver(long, long)
ImportExcel::GetLastFormula(short)
@@ -142,9 +137,6 @@ SvxDistributePage::GetRanges()
SvxNumRule::Create(SvStream&)
SvxNumberFormat::Create(SvStream&)
SvxNumberFormatShell::IsAdded_Impl(unsigned long)
-SvxPixelCtlAccessible::Invalidate()
-SvxPixelCtlAccessible::ensureIsValidAddress(int, int)
-SvxPixelCtlAccessible::ensureIsValidIndex(int)
SvxRectCtlAccessibleContext::FireAccessibleEvent(short, com::sun::star::uno::Any const&, com::sun::star::uno::Any const&)
SwAccessibleField::SwAccessibleField(SwField*, SwAccessibleParagraph*, short)
SwAccessibleParagraph::GetTOCLevel()
@@ -366,7 +358,7 @@ svl::SharedStringPool::SharedStringPool()
svx::frame::Style::Style(editeng::SvxBorderLine const&, double, unsigned short)
utl::MediaDescriptor::PROP_DEEPDETECTION()
utl::toISO8601(com::sun::star::util::Time const&)
-vcl::MapChar(vcl::_TrueTypeFont*, unsigned short, int)
+vcl::MapChar(vcl::_TrueTypeFont*, unsigned short, bool)
writerfilter::dump(writerfilter::OutputWithDepth<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >&, char const*, boost::shared_ptr<writerfilter::Reference<writerfilter::BinaryObj> >)
writerfilter::dump(writerfilter::OutputWithDepth<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >&, char const*, boost::shared_ptr<writerfilter::Reference<writerfilter::Properties> >)
writerfilter::dump(writerfilter::OutputWithDepth<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >&, char const*, rtl::OUString const&)
diff --git a/vcl/inc/impimagetree.hxx b/vcl/inc/impimagetree.hxx
index 68cb241..85e3640 100644
--- a/vcl/inc/impimagetree.hxx
+++ b/vcl/inc/impimagetree.hxx
@@ -42,9 +42,6 @@ public:
~ImplImageTree();
- /// check whether the icon style is installed
- bool checkStyle(OUString const & style);
-
bool loadImage(
OUString const & name, OUString const & style,
BitmapEx & bitmap, bool localized = false, bool loadMissing = false );
@@ -77,7 +74,6 @@ private:
OUString m_style;
Path m_path;
- CheckStyleCache m_checkStyleCache;
IconCache m_iconCache;
bool m_cacheIcons;
IconLinkHash m_linkHash;
@@ -86,7 +82,6 @@ private:
void resetPaths();
- bool checkStyleCacheLookup( OUString const & style, bool &exists );
bool iconCacheLookup( OUString const & name, bool localized, BitmapEx & bitmap );
bool find(std::vector< OUString > const & paths, BitmapEx & bitmap );
diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx
index e6722c6..96aab03 100644
--- a/vcl/source/gdi/impimagetree.cxx
+++ b/vcl/source/gdi/impimagetree.cxx
@@ -116,39 +116,6 @@ ImplImageTree::ImplImageTree() { m_cacheIcons = true; }
ImplImageTree::~ImplImageTree() {}
-bool ImplImageTree::checkStyle(OUString const & style)
-{
- bool exists;
-
- // using cache because setStyle is an expensive operation
- // setStyle calls resetPaths => closes any opened zip files with icons, cleans the icon cache, ...
- if (checkStyleCacheLookup(style, exists)) {
- return exists;
- }
-
- setStyle(style);
-
- exists = false;
- OUString aURL = m_path.first;
-
- osl::File aZip(aURL + ".zip");
- if (aZip.open(osl_File_OpenFlag_Read) == ::osl::FileBase::E_None) {
- aZip.close();
- exists = true;
- }
-
- osl::Directory aLookaside(aURL);
- if (aLookaside.open() == ::osl::FileBase::E_None) {
- aLookaside.close();
- exists = true;
- m_cacheIcons = false;
- } else {
- m_cacheIcons = true;
- }
- m_checkStyleCache[style] = exists;
- return exists;
-}
-
bool ImplImageTree::loadImage(
OUString const & name, OUString const & style, BitmapEx & bitmap,
bool localized, bool loadMissing )
@@ -222,7 +189,6 @@ void ImplImageTree::shutDown() {
m_style = OUString();
// for safety; empty m_style means "not initialized"
m_iconCache.clear();
- m_checkStyleCache.clear();
m_linkHash.clear();
}
@@ -254,18 +220,6 @@ void ImplImageTree::resetPaths() {
url, css::uno::Reference< css::container::XNameAccess >());
}
-bool ImplImageTree::checkStyleCacheLookup(
- OUString const & style, bool &exists)
-{
- CheckStyleCache::iterator i(m_checkStyleCache.find(style));
- if (i != m_checkStyleCache.end()) {
- exists = i->second;
- return true;
- } else {
- return false;
- }
-}
-
bool ImplImageTree::iconCacheLookup(
OUString const & name, bool localized, BitmapEx & bitmap)
{
commit 94ffeed68f14be4790fd537b8fb1431472613373
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 25 10:32:03 2014 +0000
coverity#737807 Uncaught exception
Change-Id: Ibee829b4d2cc4d93453f47cc59dfbaec012ffc6e
diff --git a/sd/source/ui/inc/SdUnoDrawView.hxx b/sd/source/ui/inc/SdUnoDrawView.hxx
index ce22ce5..0c0ab22 100644
--- a/sd/source/ui/inc/SdUnoDrawView.hxx
+++ b/sd/source/ui/inc/SdUnoDrawView.hxx
@@ -50,8 +50,9 @@ public:
virtual sal_Bool SAL_CALL select (
const css::uno::Any& aSelection)
- throw(css::lang::IllegalArgumentException,
- css::uno::RuntimeException);
+ throw (css::lang::IllegalArgumentException,
+ css::uno::RuntimeException,
+ std::exception);
virtual css::uno::Any SAL_CALL getSelection (void)
throw (css::uno::RuntimeException,
diff --git a/sd/source/ui/unoidl/SdUnoDrawView.cxx b/sd/source/ui/unoidl/SdUnoDrawView.cxx
index adb4514..b2bfc2e 100644
--- a/sd/source/ui/unoidl/SdUnoDrawView.cxx
+++ b/sd/source/ui/unoidl/SdUnoDrawView.cxx
@@ -176,7 +176,9 @@ void SdUnoDrawView::setActiveLayer (const Reference<drawing::XLayer>& rxLayer) t
sal_Bool SAL_CALL SdUnoDrawView::select( const Any& aSelection )
- throw(lang::IllegalArgumentException, RuntimeException)
+ throw (lang::IllegalArgumentException,
+ RuntimeException,
+ std::exception)
{
bool bOk = true;
commit 76e14408abb2a982215f311002899efbf73ab78b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 25 10:31:11 2014 +0000
coverity#737805 Uncaught exception
Change-Id: I61ca610f7183d7e72a5b36fb0bf1fe0fcd1210fe
diff --git a/sd/source/ui/inc/SdUnoDrawView.hxx b/sd/source/ui/inc/SdUnoDrawView.hxx
index 1934302..ce22ce5 100644
--- a/sd/source/ui/inc/SdUnoDrawView.hxx
+++ b/sd/source/ui/inc/SdUnoDrawView.hxx
@@ -70,7 +70,8 @@ public:
virtual void SAL_CALL setCurrentPage (
const css::uno::Reference<css::drawing::XDrawPage >& xPage)
- throw(css::uno::RuntimeException);
+ throw (css::uno::RuntimeException,
+ std::exception);
virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage (void)
throw(css::uno::RuntimeException);
diff --git a/sd/source/ui/unoidl/SdUnoDrawView.cxx b/sd/source/ui/unoidl/SdUnoDrawView.cxx
index 9c9bbcc..adb4514 100644
--- a/sd/source/ui/unoidl/SdUnoDrawView.cxx
+++ b/sd/source/ui/unoidl/SdUnoDrawView.cxx
@@ -469,7 +469,7 @@ Any SAL_CALL SdUnoDrawView::getFastPropertyValue (
void SAL_CALL SdUnoDrawView::setCurrentPage (
const Reference< drawing::XDrawPage >& xPage )
- throw(RuntimeException)
+ throw (RuntimeException, std::exception)
{
SvxDrawPage* pDrawPage = SvxDrawPage::getImplementation( xPage );
SdrPage *pSdrPage = pDrawPage ? pDrawPage->GetSdrPage() : NULL;
commit 47f4eead5db5b1e4cb29c9695e5445cc2ccaf8ad
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 25 10:30:23 2014 +0000
coverity#737802 Uncaught exception
Change-Id: I844e712f82890a4018c4ae45e7d79daaf4f6937a
diff --git a/sd/source/ui/inc/SdUnoDrawView.hxx b/sd/source/ui/inc/SdUnoDrawView.hxx
index 74d668d..1934302 100644
--- a/sd/source/ui/inc/SdUnoDrawView.hxx
+++ b/sd/source/ui/inc/SdUnoDrawView.hxx
@@ -54,7 +54,8 @@ public:
css::uno::RuntimeException);
virtual css::uno::Any SAL_CALL getSelection (void)
- throw(css::uno::RuntimeException);
+ throw (css::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL addSelectionChangeListener (
const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener)
diff --git a/sd/source/ui/unoidl/SdUnoDrawView.cxx b/sd/source/ui/unoidl/SdUnoDrawView.cxx
index 71dd63b..9c9bbcc 100644
--- a/sd/source/ui/unoidl/SdUnoDrawView.cxx
+++ b/sd/source/ui/unoidl/SdUnoDrawView.cxx
@@ -274,7 +274,7 @@ sal_Bool SAL_CALL SdUnoDrawView::select( const Any& aSelection )
Any SAL_CALL SdUnoDrawView::getSelection()
- throw(RuntimeException)
+ throw (RuntimeException, std::exception)
{
Any aAny;
commit 75864819af18e12afc835d11b7e2ece77ab35827
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 25 10:28:39 2014 +0000
coverity#737772 Uncaught exception
Change-Id: Idbff7a4dd1da93d16f85325ae992efce0b37dfee
diff --git a/sd/source/ui/framework/factories/ViewShellWrapper.cxx b/sd/source/ui/framework/factories/ViewShellWrapper.cxx
index 1ff46da..63e1030 100644
--- a/sd/source/ui/framework/factories/ViewShellWrapper.cxx
+++ b/sd/source/ui/framework/factories/ViewShellWrapper.cxx
@@ -177,7 +177,8 @@ sal_Bool SAL_CALL ViewShellWrapper::select( const ::com::sun::star::uno::Any& aS
return bOk;
}
-uno::Any SAL_CALL ViewShellWrapper::getSelection() throw(uno::RuntimeException)
+uno::Any SAL_CALL ViewShellWrapper::getSelection()
+ throw (uno::RuntimeException, std::exception)
{
Any aResult;
diff --git a/sd/source/ui/inc/framework/ViewShellWrapper.hxx b/sd/source/ui/inc/framework/ViewShellWrapper.hxx
index c279bde..e9db251 100644
--- a/sd/source/ui/inc/framework/ViewShellWrapper.hxx
+++ b/sd/source/ui/inc/framework/ViewShellWrapper.hxx
@@ -102,7 +102,9 @@ public:
// XSelectionSupplier
virtual sal_Bool SAL_CALL select( const ::com::sun::star::uno::Any& aSelection ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Any SAL_CALL getSelection( ) throw(::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Any SAL_CALL getSelection()
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL addSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL removeSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException);
commit 62c5c0e36bd00d391e81cc3e13302b3885f54d1b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 25 10:26:45 2014 +0000
coverity#737738 Uncaught exception
Change-Id: If7622500b90155522144c10a48e4dd331c6cf471
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index 5725971..22d3085 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -4413,7 +4413,8 @@ static void lcl_setTableFieldsFromCriteria( OUString& sCriteria1, uno::Reference
}
void SAL_CALL
-ScVbaRange::AutoFilter( const uno::Any& aField, const uno::Any& Criteria1, const uno::Any& Operator, const uno::Any& Criteria2, const uno::Any& VisibleDropDown ) throw (uno::RuntimeException)
+ScVbaRange::AutoFilter( const uno::Any& aField, const uno::Any& Criteria1, const uno::Any& Operator, const uno::Any& Criteria2, const uno::Any& VisibleDropDown )
+ throw (uno::RuntimeException, std::exception)
{
// Is there an existing autofilter
RangeHelper thisRange( mxRange );
diff --git a/sc/source/ui/vba/vbarange.hxx b/sc/source/ui/vba/vbarange.hxx
index 2452427..5d826c1 100644
--- a/sc/source/ui/vba/vbarange.hxx
+++ b/sc/source/ui/vba/vbarange.hxx
@@ -246,7 +246,8 @@ public:
const css::uno::Any& Weight, const css::uno::Any& ColorIndex, const css::uno::Any& Color ) throw (css::uno::RuntimeException);
virtual css::uno::Any SAL_CALL Hyperlinks( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
- virtual void SAL_CALL AutoFilter( const css::uno::Any& Field, const css::uno::Any& Criteria1, const css::uno::Any& Operator, const css::uno::Any& Criteria2, const css::uno::Any& VisibleDropDown ) throw (css::uno::RuntimeException);
+ virtual void SAL_CALL AutoFilter( const css::uno::Any& Field, const css::uno::Any& Criteria1, const css::uno::Any& Operator, const css::uno::Any& Criteria2, const css::uno::Any& VisibleDropDown )
+ throw (css::uno::RuntimeException, std::exception);
virtual void SAL_CALL Insert( const css::uno::Any& Shift, const css::uno::Any& CopyOrigin ) throw (css::uno::RuntimeException);
virtual void SAL_CALL Autofit() throw (css::uno::RuntimeException);
virtual void SAL_CALL PrintOut( const css::uno::Any& From, const css::uno::Any& To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName ) throw (css::uno::RuntimeException);
commit e8443172c4ed0479acd33115ae1f0153f1e41381
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 25 10:25:31 2014 +0000
coverity#737726 Uncaught exception
Change-Id: Ia6a53ea7d073e22620b7e85eafc27f35f6291709
diff --git a/sc/inc/viewuno.hxx b/sc/inc/viewuno.hxx
index 6cd6826..5e0691b 100644
--- a/sc/inc/viewuno.hxx
+++ b/sc/inc/viewuno.hxx
@@ -372,7 +372,8 @@ public:
throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL addRangeSelectionChangeListener( const ::com::sun::star::uno::Reference<
::com::sun::star::sheet::XRangeSelectionChangeListener >& aListener )
- throw(::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL removeRangeSelectionChangeListener( const ::com::sun::star::uno::Reference<
::com::sun::star::sheet::XRangeSelectionChangeListener >& aListener )
throw(::com::sun::star::uno::RuntimeException);
diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx
index e58b7b4..677bfde 100644
--- a/sc/source/ui/unoobj/viewuno.cxx
+++ b/sc/source/ui/unoobj/viewuno.cxx
@@ -2145,8 +2145,8 @@ void SAL_CALL ScTabViewObj::removeRangeSelectionListener(
}
void SAL_CALL ScTabViewObj::addRangeSelectionChangeListener(
- const uno::Reference<sheet::XRangeSelectionChangeListener>& xListener )
- throw(uno::RuntimeException)
+ const uno::Reference<sheet::XRangeSelectionChangeListener>& xListener )
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
uno::Reference<sheet::XRangeSelectionChangeListener>* pObj =
commit db0e23abe9c285aabeed332f0c03f48988e48fd3
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 25 10:24:43 2014 +0000
coverity#737725 Uncaught exception
Change-Id: If66782ee4cac491a3115b6274258be533dbf2f4b
diff --git a/sc/inc/viewuno.hxx b/sc/inc/viewuno.hxx
index e7f1d1f..6cd6826 100644
--- a/sc/inc/viewuno.hxx
+++ b/sc/inc/viewuno.hxx
@@ -323,7 +323,8 @@ public:
virtual void SAL_CALL addEnhancedMouseClickHandler( const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XEnhancedMouseClickHandler >& aListener )
- throw (::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL removeEnhancedMouseClickHandler( const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XEnhancedMouseClickHandler >& aListener )
throw (::com::sun::star::uno::RuntimeException);
diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx
index 6f98cf0..e58b7b4 100644
--- a/sc/source/ui/unoobj/viewuno.cxx
+++ b/sc/source/ui/unoobj/viewuno.cxx
@@ -1398,7 +1398,7 @@ void ScTabViewObj::EndActivationListening()
}
void SAL_CALL ScTabViewObj::addEnhancedMouseClickHandler( const uno::Reference< awt::XEnhancedMouseClickHandler >& aListener )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
commit 4fd131c78fb02d35c07c842bdff651eacb488d43
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 25 10:23:43 2014 +0000
coverity#737724 Uncaught exception
Change-Id: Ie1b51865e9c3e0e30b33152ec4b400c703007a57
diff --git a/sc/inc/viewuno.hxx b/sc/inc/viewuno.hxx
index 755079c..e7f1d1f 100644
--- a/sc/inc/viewuno.hxx
+++ b/sc/inc/viewuno.hxx
@@ -242,7 +242,8 @@ public:
std::exception);
virtual void SAL_CALL addSelectionChangeListener( const ::com::sun::star::uno::Reference<
::com::sun::star::view::XSelectionChangeListener >& xListener )
- throw(::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL removeSelectionChangeListener( const ::com::sun::star::uno::Reference<
::com::sun::star::view::XSelectionChangeListener >& xListener )
throw(::com::sun::star::uno::RuntimeException);
diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx
index f8c3b0b..6f98cf0 100644
--- a/sc/source/ui/unoobj/viewuno.cxx
+++ b/sc/source/ui/unoobj/viewuno.cxx
@@ -1731,8 +1731,8 @@ void SAL_CALL ScTabViewObj::freezeAtPosition( sal_Int32 nColumns, sal_Int32 nRow
}
void SAL_CALL ScTabViewObj::addSelectionChangeListener(
- const uno::Reference<view::XSelectionChangeListener>& xListener )
- throw(uno::RuntimeException)
+ const uno::Reference<view::XSelectionChangeListener>& xListener )
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
uno::Reference<view::XSelectionChangeListener>* pObj =
commit 2bbbfe03c3dcd50fd72f6d206a39cdde463a0107
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 25 10:23:11 2014 +0000
coverity#737723 Uncaught exception
Change-Id: I0026fc7811469eae3f62b531ad1626a6af1f743c
diff --git a/sc/inc/viewuno.hxx b/sc/inc/viewuno.hxx
index 1d4c92a..755079c 100644
--- a/sc/inc/viewuno.hxx
+++ b/sc/inc/viewuno.hxx
@@ -331,7 +331,8 @@ public:
virtual void SAL_CALL addActivationEventListener( const ::com::sun::star::uno::Reference<
::com::sun::star::sheet::XActivationEventListener >& aListener )
- throw (::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL removeActivationEventListener( const ::com::sun::star::uno::Reference<
::com::sun::star::sheet::XActivationEventListener >& aListener )
throw (::com::sun::star::uno::RuntimeException);
diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx
index 0bf01bd..f8c3b0b 100644
--- a/sc/source/ui/unoobj/viewuno.cxx
+++ b/sc/source/ui/unoobj/viewuno.cxx
@@ -1433,7 +1433,7 @@ void SAL_CALL ScTabViewObj::removeEnhancedMouseClickHandler( const uno::Referenc
// XActivationBroadcaster
void SAL_CALL ScTabViewObj::addActivationEventListener( const uno::Reference< sheet::XActivationEventListener >& aListener )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
commit 21a5393672174a52a573077bba3685e3ebe671d3
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 25 10:22:25 2014 +0000
coverity#737722 Uncaught exception
Change-Id: I8fc0f9851c46e810f00cd88898e1dc6aa5005c75
diff --git a/sc/inc/viewuno.hxx b/sc/inc/viewuno.hxx
index b4402e6..1d4c92a 100644
--- a/sc/inc/viewuno.hxx
+++ b/sc/inc/viewuno.hxx
@@ -362,7 +362,8 @@ public:
virtual void SAL_CALL abortRangeSelection() throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL addRangeSelectionListener( const ::com::sun::star::uno::Reference<
::com::sun::star::sheet::XRangeSelectionListener >& aListener )
- throw(::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL removeRangeSelectionListener( const ::com::sun::star::uno::Reference<
::com::sun::star::sheet::XRangeSelectionListener >& aListener )
throw(::com::sun::star::uno::RuntimeException);
diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx
index 6900a01..0bf01bd 100644
--- a/sc/source/ui/unoobj/viewuno.cxx
+++ b/sc/source/ui/unoobj/viewuno.cxx
@@ -2119,8 +2119,8 @@ void SAL_CALL ScTabViewObj::abortRangeSelection() throw(uno::RuntimeException)
}
void SAL_CALL ScTabViewObj::addRangeSelectionListener(
- const uno::Reference<sheet::XRangeSelectionListener>& xListener )
- throw(uno::RuntimeException)
+ const uno::Reference<sheet::XRangeSelectionListener>& xListener )
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
uno::Reference<sheet::XRangeSelectionListener>* pObj =
commit ff8d78ff892567523a2a5f6bd8056f5350343fdc
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 25 10:21:43 2014 +0000
coverity#737721 Uncaught exception
Change-Id: Ibc5e4532a451829a6e6113c42d9013017205ba70
diff --git a/sc/inc/viewuno.hxx b/sc/inc/viewuno.hxx
index 61762c3..b4402e6 100644
--- a/sc/inc/viewuno.hxx
+++ b/sc/inc/viewuno.hxx
@@ -271,9 +271,10 @@ public:
virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertyChangeListener >& xListener )
- throw(::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::beans::UnknownPropertyException,
+ ::com::sun::star::lang::WrappedTargetException,
+ ::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertyChangeListener >& aListener )
diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx
index 86f4dd6..6900a01 100644
--- a/sc/source/ui/unoobj/viewuno.cxx
+++ b/sc/source/ui/unoobj/viewuno.cxx
@@ -2011,10 +2011,11 @@ uno::Any SAL_CALL ScTabViewObj::getPropertyValue( const OUString& aPropertyName
}
void SAL_CALL ScTabViewObj::addPropertyChangeListener( const OUString& /* aPropertyName */,
- const uno::Reference<beans::XPropertyChangeListener >& xListener )
- throw(beans::UnknownPropertyException,
- lang::WrappedTargetException,
- uno::RuntimeException)
+ const uno::Reference<beans::XPropertyChangeListener >& xListener )
+ throw (beans::UnknownPropertyException,
+ lang::WrappedTargetException,
+ uno::RuntimeException,
+ std::exception)
{
SolarMutexGuard aGuard;
uno::Reference<beans::XPropertyChangeListener>* pObj =
commit 02b9b512f0071c46ae648482e9240a9c4c80d9ac
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 25 10:20:28 2014 +0000
coverity#737700 Uncaught exception
Change-Id: I9a2954c038946f1ad47979ff65ac12983ddffab9
diff --git a/sc/inc/tokenuno.hxx b/sc/inc/tokenuno.hxx
index 408298d..1b86300 100644
--- a/sc/inc/tokenuno.hxx
+++ b/sc/inc/tokenuno.hxx
@@ -76,7 +76,8 @@ public:
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken > SAL_CALL parseFormula(
const OUString& aFormula,
const ::com::sun::star::table::CellAddress& rReferencePos )
- throw (::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual OUString SAL_CALL printFormula( const ::com::sun::star::uno::Sequence<
::com::sun::star::sheet::FormulaToken >& aTokens,
const ::com::sun::star::table::CellAddress& rReferencePos )
diff --git a/sc/source/ui/unoobj/tokenuno.cxx b/sc/source/ui/unoobj/tokenuno.cxx
index a75c38b..0cc4bbf 100644
--- a/sc/source/ui/unoobj/tokenuno.cxx
+++ b/sc/source/ui/unoobj/tokenuno.cxx
@@ -125,8 +125,8 @@ void ScFormulaParserObj::SetCompilerFlags( ScCompiler& rCompiler ) const
}
uno::Sequence<sheet::FormulaToken> SAL_CALL ScFormulaParserObj::parseFormula(
- const OUString& aFormula, const table::CellAddress& rReferencePos )
- throw (uno::RuntimeException)
+ const OUString& aFormula, const table::CellAddress& rReferencePos )
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
uno::Sequence<sheet::FormulaToken> aRet;
commit 8c9d3a0317445abdb196733dde69ff8e7acc8a4a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 25 10:19:20 2014 +0000
coverity#737681 Uncaught exception
Change-Id: I2b81c265e5e7a7a7af7a3210d4ab92d60272a748
diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx
index 6a2b74f..c09e8cc 100644
--- a/sc/source/ui/unoobj/shapeuno.cxx
+++ b/sc/source/ui/unoobj/shapeuno.cxx
@@ -1466,7 +1466,9 @@ public:
}
// XNameAccess
- virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
+ virtual uno::Any SAL_CALL getByName( const OUString& aName )
+ throw (container::NoSuchElementException, lang::WrappedTargetException,
+ uno::RuntimeException, std::exception)
{
uno::Sequence< beans::PropertyValue > aProperties;
ScMacroInfo* pInfo = getInfo();
commit 6b52bd74922c870093225af24a449f858dc615c8
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 25 10:18:34 2014 +0000
coverity#737680 Uncaught exception
Change-Id: I126c6632574828d6afc8fedd2dbde00642882225
diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx
index 9c10318..6a2b74f 100644
--- a/sc/source/ui/unoobj/shapeuno.cxx
+++ b/sc/source/ui/unoobj/shapeuno.cxx
@@ -1427,7 +1427,10 @@ public:
}
// XNameReplace
- virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
+ virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement )
+ throw (lang::IllegalArgumentException, container::NoSuchElementException,
+ lang::WrappedTargetException, uno::RuntimeException,
+ std::exception)
{
if ( !hasByName( aName ) )
throw container::NoSuchElementException();
commit 90adc6071ba2bfce3f8fad5c5a22cd4d44982ec0
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 25 10:17:39 2014 +0000
coverity#737679 Uncaught exception
Change-Id: I2df4c0ddedde044600a384084bb98e588796d4aa
diff --git a/sc/inc/shapeuno.hxx b/sc/inc/shapeuno.hxx
index 38d0fe0..d70214f 100644
--- a/sc/inc/shapeuno.hxx
+++ b/sc/inc/shapeuno.hxx
@@ -151,8 +151,9 @@ public:
throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName )
- throw(::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::beans::UnknownPropertyException,
+ ::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault(
const OUString& aPropertyName )
throw(::com::sun::star::beans::UnknownPropertyException,
diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx
index 8da14f791..9c10318 100644
--- a/sc/source/ui/unoobj/shapeuno.cxx
+++ b/sc/source/ui/unoobj/shapeuno.cxx
@@ -962,7 +962,8 @@ uno::Sequence<beans::PropertyState> SAL_CALL ScShapeObj::getPropertyStates(
}
void SAL_CALL ScShapeObj::setPropertyToDefault( const OUString& aPropertyName )
- throw(beans::UnknownPropertyException, uno::RuntimeException)
+ throw (beans::UnknownPropertyException, uno::RuntimeException,
+ std::exception)
{
SolarMutexGuard aGuard;
OUString aNameString(aPropertyName);
commit a760a41080599f4a6aaab8628e15098fdb0b2d28
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 25 10:16:18 2014 +0000
coverity#737649 Uncaught exception
Change-Id: I6ab46cc817f2858ae1a92757d8c26d6145f934b8
diff --git a/sc/inc/nameuno.hxx b/sc/inc/nameuno.hxx
index 3f2ee92..4e82e6e 100644
--- a/sc/inc/nameuno.hxx
+++ b/sc/inc/nameuno.hxx
@@ -214,7 +214,8 @@ public:
/// XNamedRanges
virtual void SAL_CALL addNewByName( const OUString& aName, const OUString& aContent,
const ::com::sun::star::table::CellAddress& aPosition, sal_Int32 nType )
- throw(::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL addNewFromTitles( const ::com::sun::star::table::CellRangeAddress& aSource,
::com::sun::star::sheet::Border aBorder )
throw(::com::sun::star::uno::RuntimeException);
diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx
index c130c46..502754f 100644
--- a/sc/source/ui/unoobj/nameuno.cxx
+++ b/sc/source/ui/unoobj/nameuno.cxx
@@ -505,8 +505,9 @@ bool ScNamedRangesObj::IsModifyAndBroadcast() const
// sheet::XNamedRanges
void SAL_CALL ScNamedRangesObj::addNewByName( const OUString& aName,
- const OUString& aContent, const table::CellAddress& aPosition,
- sal_Int32 nUnoType ) throw(uno::RuntimeException)
+ const OUString& aContent, const table::CellAddress& aPosition,
+ sal_Int32 nUnoType )
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
ScAddress aPos( (SCCOL)aPosition.Column, (SCROW)aPosition.Row, aPosition.Sheet );
commit 3f94ccfe58b3c65d172767a7f9e7874a08b7a209
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 25 10:15:30 2014 +0000
coverity#737643 Uncaught exception
Change-Id: Ie200b47adae43844fcb6be349bec51b949e65675
diff --git a/sc/inc/nameuno.hxx b/sc/inc/nameuno.hxx
index cbd06fe..3f2ee92 100644
--- a/sc/inc/nameuno.hxx
+++ b/sc/inc/nameuno.hxx
@@ -101,7 +101,8 @@ public:
std::exception);
virtual void SAL_CALL setTokens( const ::com::sun::star::uno::Sequence<
::com::sun::star::sheet::FormulaToken >& aTokens )
- throw (::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
/// XNamed
virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException);
diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx
index ea23cbc..c130c46 100644
--- a/sc/source/ui/unoobj/nameuno.cxx
+++ b/sc/source/ui/unoobj/nameuno.cxx
@@ -337,7 +337,8 @@ uno::Sequence<sheet::FormulaToken> SAL_CALL ScNamedRangeObj::getTokens()
return aSequence;
}
-void SAL_CALL ScNamedRangeObj::setTokens( const uno::Sequence<sheet::FormulaToken>& rTokens ) throw(uno::RuntimeException)
+void SAL_CALL ScNamedRangeObj::setTokens( const uno::Sequence<sheet::FormulaToken>& rTokens )
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
if( pDocShell )
commit f87bfc8d83015c028f10ca65e6fe11313bddedfc
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 25 10:14:46 2014 +0000
coverity#737641 Uncaught exception
Change-Id: I7f60b029269052aa255689959c773a4c638f0763
diff --git a/sc/inc/nameuno.hxx b/sc/inc/nameuno.hxx
index f981697..cbd06fe 100644
--- a/sc/inc/nameuno.hxx
+++ b/sc/inc/nameuno.hxx
@@ -97,7 +97,8 @@ public:
/// XFormulaTokens
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken > SAL_CALL getTokens()
- throw (::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL setTokens( const ::com::sun::star::uno::Sequence<
::com::sun::star::sheet::FormulaToken >& aTokens )
throw (::com::sun::star::uno::RuntimeException);
diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx
index c29e021..ea23cbc 100644
--- a/sc/source/ui/unoobj/nameuno.cxx
+++ b/sc/source/ui/unoobj/nameuno.cxx
@@ -322,7 +322,8 @@ void SAL_CALL ScNamedRangeObj::setType( sal_Int32 nUnoType )
// XFormulaTokens
-uno::Sequence<sheet::FormulaToken> SAL_CALL ScNamedRangeObj::getTokens() throw(uno::RuntimeException)
+uno::Sequence<sheet::FormulaToken> SAL_CALL ScNamedRangeObj::getTokens()
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
uno::Sequence<sheet::FormulaToken> aSequence;
commit 617d45ee4aee174a330b5e9b1e5264d71bb42224
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 25 10:13:57 2014 +0000
coverity#737640 Uncaught exception
Change-Id: I0f393aff439f6cf051439cbb8b9df2323049b919
diff --git a/sc/inc/nameuno.hxx b/sc/inc/nameuno.hxx
index 01d42ff..f981697 100644
--- a/sc/inc/nameuno.hxx
+++ b/sc/inc/nameuno.hxx
@@ -91,7 +91,9 @@ public:
throw (::com::sun::star::uno::RuntimeException,
std::exception);
virtual sal_Int32 SAL_CALL getType() throw(::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setType( sal_Int32 nType ) throw(::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setType( sal_Int32 nType )
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
/// XFormulaTokens
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken > SAL_CALL getTokens()
diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx
index 9176815..c29e021 100644
--- a/sc/source/ui/unoobj/nameuno.cxx
+++ b/sc/source/ui/unoobj/nameuno.cxx
@@ -305,7 +305,8 @@ sal_Int32 SAL_CALL ScNamedRangeObj::getType() throw(uno::RuntimeException)
return nType;
}
-void SAL_CALL ScNamedRangeObj::setType( sal_Int32 nUnoType ) throw(uno::RuntimeException)
+void SAL_CALL ScNamedRangeObj::setType( sal_Int32 nUnoType )
+ throw (uno::RuntimeException, std::exception)
{
// see property 'IsSharedFormula' for RT_SHARED
SolarMutexGuard aGuard;
commit 97faf80004cc431b4d8ae7922d39c23f9c82f4af
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 25 10:13:06 2014 +0000
coverity#737638 Uncaught exception
Change-Id: I7d665000d8f20fb1d734f6cd00af64d583b875d3
diff --git a/sc/inc/nameuno.hxx b/sc/inc/nameuno.hxx
index 5d817f7..01d42ff 100644
--- a/sc/inc/nameuno.hxx
+++ b/sc/inc/nameuno.hxx
@@ -103,7 +103,8 @@ public:
/// XNamed
virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setName( const OUString& aName )
- throw(::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
/// XCellRangeReferrer
virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL
diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx
index 6861276..9176815 100644
--- a/sc/source/ui/unoobj/nameuno.cxx
+++ b/sc/source/ui/unoobj/nameuno.cxx
@@ -220,7 +220,7 @@ OUString SAL_CALL ScNamedRangeObj::getName() throw(uno::RuntimeException)
}
void SAL_CALL ScNamedRangeObj::setName( const OUString& aNewName )
- throw(uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
//! adapt formulas ?????
commit c9c4536b46d7e429d5a0ebc3f195bf90a72dd13e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 25 10:12:18 2014 +0000
coverity#737632 Uncaught exception
Change-Id: I3faaddd4e9ecba80ab6dae8a20822374431b7c34
diff --git a/sc/inc/nameuno.hxx b/sc/inc/nameuno.hxx
index 463aafb..5d817f7 100644
--- a/sc/inc/nameuno.hxx
+++ b/sc/inc/nameuno.hxx
@@ -82,7 +82,8 @@ public:
/// XNamedRange
virtual OUString SAL_CALL getContent() throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setContent( const OUString& aContent )
- throw(::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual ::com::sun::star::table::CellAddress SAL_CALL getReferencePosition()
throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setReferencePosition(
diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx
index 645f98b..6861276 100644
--- a/sc/source/ui/unoobj/nameuno.cxx
+++ b/sc/source/ui/unoobj/nameuno.cxx
@@ -245,7 +245,7 @@ OUString SAL_CALL ScNamedRangeObj::getContent() throw(uno::RuntimeException)
}
void SAL_CALL ScNamedRangeObj::setContent( const OUString& aContent )
- throw(uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
OUString aContStr(aContent);
commit 4e640fef8ff1a7e31f56d406f6c010676499c711
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 25 10:11:06 2014 +0000
coverity#737628 Uncaught exception
Change-Id: If5c1247731b494a821cff84b3adc103cc9695595
diff --git a/sc/inc/linkuno.hxx b/sc/inc/linkuno.hxx
index ee29a6c..aa6a2dc 100644
--- a/sc/inc/linkuno.hxx
+++ b/sc/inc/linkuno.hxx
@@ -85,7 +85,9 @@ public:
throw(::com::sun::star::uno::RuntimeException);
// XRefreshable
- virtual void SAL_CALL refresh() throw(::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL refresh()
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL addRefreshListener( const ::com::sun::star::uno::Reference<
::com::sun::star::util::XRefreshListener >& l )
throw (::com::sun::star::uno::RuntimeException,
diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx
index 1ebff8c..9bba5ba 100644
--- a/sc/source/ui/unoobj/linkuno.cxx
+++ b/sc/source/ui/unoobj/linkuno.cxx
@@ -145,7 +145,8 @@ void SAL_CALL ScSheetLinkObj::setName( const OUString& aName ) throw(uno::Runtim
// XRefreshable
-void SAL_CALL ScSheetLinkObj::refresh() throw(uno::RuntimeException)
+void SAL_CALL ScSheetLinkObj::refresh()
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
ScTableLink* pLink = GetLink_Impl();
commit aead10d26fc34ce541f629e95327abf548e780c9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 25 10:10:08 2014 +0000
coverity#737625 Uncaught exception
Change-Id: Ic90165af0fb52d40b46ec0ccdb2df9db15a130b5
diff --git a/sc/inc/linkuno.hxx b/sc/inc/linkuno.hxx
index 2ccc362..ee29a6c 100644
--- a/sc/inc/linkuno.hxx
+++ b/sc/inc/linkuno.hxx
@@ -88,7 +88,8 @@ public:
virtual void SAL_CALL refresh() throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL addRefreshListener( const ::com::sun::star::uno::Reference<
::com::sun::star::util::XRefreshListener >& l )
- throw(::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL removeRefreshListener( const ::com::sun::star::uno::Reference<
::com::sun::star::util::XRefreshListener >& l )
throw(::com::sun::star::uno::RuntimeException);
diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx
index 4f7b49b..1ebff8c 100644
--- a/sc/source/ui/unoobj/linkuno.cxx
+++ b/sc/source/ui/unoobj/linkuno.cxx
@@ -154,8 +154,8 @@ void SAL_CALL ScSheetLinkObj::refresh() throw(uno::RuntimeException)
}
void SAL_CALL ScSheetLinkObj::addRefreshListener(
- const uno::Reference<util::XRefreshListener >& xListener )
- throw(uno::RuntimeException)
+ const uno::Reference<util::XRefreshListener >& xListener )
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
uno::Reference<util::XRefreshListener>* pObj =
commit f2e81e5803ecc487e83669fe2d3eb14558b9cb37
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 25 10:08:51 2014 +0000
coverity#737623 Uncaught exception
Change-Id: I43a3e098b3adedbcada4f26c507de0272a4775ec
diff --git a/sc/inc/linkuno.hxx b/sc/inc/linkuno.hxx
index cafe41a..2ccc362 100644
--- a/sc/inc/linkuno.hxx
+++ b/sc/inc/linkuno.hxx
@@ -484,7 +484,8 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDDELink > SAL_CALL addDDELink(
const OUString& aApplication, const OUString& aTopic,
const OUString& aItem, ::com::sun::star::sheet::DDELinkMode nMode )
- throw (::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx
index ad5ae02..4f7b49b 100644
--- a/sc/source/ui/unoobj/linkuno.cxx
+++ b/sc/source/ui/unoobj/linkuno.cxx
@@ -1416,7 +1416,7 @@ sal_Bool SAL_CALL ScDDELinksObj::hasByName( const OUString& aName )
uno::Reference< sheet::XDDELink > ScDDELinksObj::addDDELink(
const OUString& aApplication, const OUString& aTopic,
const OUString& aItem, ::com::sun::star::sheet::DDELinkMode nMode )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
uno::Reference< sheet::XDDELink > xLink;
commit 8a6c074532f837a636e043b4f5e25f927ec62352
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 25 10:08:05 2014 +0000
coverity#737620 Uncaught exception
Change-Id: Idd75e9c344473f8d7f86f3d073568b55c4638adc
diff --git a/sc/inc/linkuno.hxx b/sc/inc/linkuno.hxx
index 1e64e6a..cafe41a 100644
--- a/sc/inc/linkuno.hxx
+++ b/sc/inc/linkuno.hxx
@@ -236,11 +236,12 @@ public:
// XRefreshable
virtual void SAL_CALL refresh()
- throw(::com::sun::star::uno::RuntimeException,
- std::exception);
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL addRefreshListener( const ::com::sun::star::uno::Reference<
::com::sun::star::util::XRefreshListener >& l )
- throw(::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL removeRefreshListener( const ::com::sun::star::uno::Reference<
::com::sun::star::util::XRefreshListener >& l )
throw(::com::sun::star::uno::RuntimeException);
diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx
index d0c3eb9..ad5ae02 100644
--- a/sc/source/ui/unoobj/linkuno.cxx
+++ b/sc/source/ui/unoobj/linkuno.cxx
@@ -705,8 +705,8 @@ void SAL_CALL ScAreaLinkObj::refresh()
}
void SAL_CALL ScAreaLinkObj::addRefreshListener(
- const uno::Reference<util::XRefreshListener >& xListener )
- throw(uno::RuntimeException)
+ const uno::Reference<util::XRefreshListener >& xListener )
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
uno::Reference<util::XRefreshListener>* pObj =
commit ddfe6a197aa3c09ba84311a540f7eb40c8893da1
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 25 10:07:00 2014 +0000
coverity#737619 Uncaught exception
Change-Id: I0e8d44d94fc34eb8d0b1b14fcdc997fafe0dca64
diff --git a/sc/inc/linkuno.hxx b/sc/inc/linkuno.hxx
index 30b27eb..1e64e6a 100644
--- a/sc/inc/linkuno.hxx
+++ b/sc/inc/linkuno.hxx
@@ -408,7 +408,8 @@ public:
virtual void SAL_CALL refresh() throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL addRefreshListener( const ::com::sun::star::uno::Reference<
::com::sun::star::util::XRefreshListener >& l )
- throw(::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL removeRefreshListener( const ::com::sun::star::uno::Reference<
::com::sun::star::util::XRefreshListener >& l )
throw(::com::sun::star::uno::RuntimeException);
diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx
index c3f4356..d0c3eb9 100644
--- a/sc/source/ui/unoobj/linkuno.cxx
+++ b/sc/source/ui/unoobj/linkuno.cxx
@@ -1144,8 +1144,8 @@ void SAL_CALL ScDDELinkObj::refresh() throw(uno::RuntimeException)
}
void SAL_CALL ScDDELinkObj::addRefreshListener(
- const uno::Reference<util::XRefreshListener >& xListener )
- throw(uno::RuntimeException)
+ const uno::Reference<util::XRefreshListener >& xListener )
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
uno::Reference<util::XRefreshListener>* pObj =
commit 291bd0964b6e42b23e989d94262758b5d59da05a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 25 10:05:58 2014 +0000
coverity#737618 Uncaught exception
Change-Id: Ib8b5f89136dbd51c4cbcdca98584daa0f673982e
diff --git a/sc/inc/linkuno.hxx b/sc/inc/linkuno.hxx
index cfba497..30b27eb 100644
--- a/sc/inc/linkuno.hxx
+++ b/sc/inc/linkuno.hxx
@@ -420,7 +420,8 @@ public:
std::exception);
virtual void SAL_CALL setResults(
const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& aResults )
- throw (::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx
index 68c09be..c3f4356 100644
--- a/sc/source/ui/unoobj/linkuno.cxx
+++ b/sc/source/ui/unoobj/linkuno.cxx
@@ -1218,7 +1218,7 @@ uno::Sequence< uno::Sequence< uno::Any > > ScDDELinkObj::getResults( )
}
void ScDDELinkObj::setResults( const uno::Sequence< uno::Sequence< uno::Any > >& aResults )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
bool bSuccess = false;
commit 20a051ba4c5d4cdbd3f56e55c82b3dfc08ff77fd
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 25 10:05:19 2014 +0000
coverity#737617 Uncaught exception
Change-Id: If0fbfa80afbdc273ffc774d2ad9c66d30052ed56
diff --git a/sc/inc/linkuno.hxx b/sc/inc/linkuno.hxx
index f02d362..cfba497 100644
--- a/sc/inc/linkuno.hxx
+++ b/sc/inc/linkuno.hxx
@@ -416,7 +416,8 @@ public:
// XDDELinkResults
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >
SAL_CALL getResults( )
- throw (::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL setResults(
const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& aResults )
throw (::com::sun::star::uno::RuntimeException);
diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx
index 02cd924..68c09be 100644
--- a/sc/source/ui/unoobj/linkuno.cxx
+++ b/sc/source/ui/unoobj/linkuno.cxx
@@ -1179,7 +1179,7 @@ void SAL_CALL ScDDELinkObj::removeRefreshListener(
// XDDELinkResults
uno::Sequence< uno::Sequence< uno::Any > > ScDDELinkObj::getResults( )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
uno::Sequence< uno::Sequence< uno::Any > > aReturn;
commit 9e03658551fc9f7a5f3cb46b0f58bca04b61b259
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 25 10:03:51 2014 +0000
coverity#737615 Uncaught exception
Change-Id: I9005fcdec6e258d274657b44786e3a2729418005
diff --git a/sc/inc/funcuno.hxx b/sc/inc/funcuno.hxx
index 96fe3c1..6dd8a82 100644
--- a/sc/inc/funcuno.hxx
+++ b/sc/inc/funcuno.hxx
@@ -81,9 +81,10 @@ public:
const OUString& aName,
const ::com::sun::star::uno::Sequence<
::com::sun::star::uno::Any >& aArguments )
- throw(::com::sun::star::container::NoSuchElementException,
- ::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::container::NoSuchElementException,
+ ::com::sun::star::lang::IllegalArgumentException,
+ ::com::sun::star::uno::RuntimeException,
+ std::exception);
// XPropertySet
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >
diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx
index db56e81..bc7571a 100644
--- a/sc/source/ui/unoobj/funcuno.cxx
+++ b/sc/source/ui/unoobj/funcuno.cxx
@@ -487,8 +487,8 @@ static void processSequences( ScDocument* pDoc, const uno::Any& rArg, ScTokenArr
uno::Any SAL_CALL ScFunctionAccess::callFunction( const OUString& aName,
const uno::Sequence<uno::Any>& aArguments )
- throw(container::NoSuchElementException, lang::IllegalArgumentException,
- uno::RuntimeException)
+ throw (container::NoSuchElementException, lang::IllegalArgumentException,
+ uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
commit eddc4b1046c391157d9672636870f5e8d31ba86f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 25 10:02:38 2014 +0000
coverity#737607 Uncaught exception
Change-Id: Id3334108f0216f19219a7681e2e816f4d07420ea
diff --git a/sc/inc/fielduno.hxx b/sc/inc/fielduno.hxx
index d4d580d..6dd5ad6 100644
--- a/sc/inc/fielduno.hxx
+++ b/sc/inc/fielduno.hxx
@@ -276,11 +276,12 @@ public:
throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName,
const ::com::sun::star::uno::Any& aValue )
- throw(::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::beans::PropertyVetoException,
- ::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::beans::UnknownPropertyException,
+ ::com::sun::star::beans::PropertyVetoException,
+ ::com::sun::star::lang::IllegalArgumentException,
+ ::com::sun::star::lang::WrappedTargetException,
+ ::com::sun::star::uno::RuntimeException,
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list