[Libreoffice-commits] core.git: 43 commits - accessibility/inc accessibility/source basctl/source chart2/Library_chartcontroller.mk chart2/source framework/source include/sfx2 include/svtools include/svx include/xmloff oox/source sc/inc sc/Library_sc.mk sc/source sd/source sfx2/source svtools/source svx/source sw/inc sw/qa sw/source ucb/source unusedcode.easy vcl/qa vcl/unx writerfilter/source xmloff/source
Caolán McNamara
caolanm at redhat.com
Mon Feb 10 03:22:02 PST 2014
accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx | 1
accessibility/source/standard/vclxaccessiblelist.cxx | 14
basctl/source/basicide/moduldlg.cxx | 5
basctl/source/basicide/moduldlg.hxx | 1
chart2/Library_chartcontroller.mk | 1
chart2/source/controller/dialogs/Bitmaps.hrc | 3
chart2/source/controller/dialogs/Bitmaps.src | 9
chart2/source/controller/dialogs/RangeSelectionButton.cxx | 41 -
chart2/source/controller/dialogs/Strings.src | 10
chart2/source/controller/dialogs/TextDirectionListBox.cxx | 15
chart2/source/controller/dialogs/res_ErrorBar.cxx | 2
chart2/source/controller/dialogs/res_LegendPosition.cxx | 8
chart2/source/controller/dialogs/tp_RangeChooser.hxx | 1
chart2/source/controller/inc/RangeSelectionButton.hxx | 42 -
chart2/source/controller/inc/TextDirectionListBox.hxx | 2
chart2/source/controller/inc/res_ErrorBar.hxx | 3
chart2/source/controller/inc/res_LegendPosition.hxx | 2
chart2/source/inc/Strings.hrc | 1
framework/source/uiconfiguration/imagemanagerimpl.cxx | 4
framework/source/uiconfiguration/imagemanagerimpl.hxx | 5
include/sfx2/basedlgs.hxx | 1
include/sfx2/tabdlg.hxx | 6
include/sfx2/templatelocalview.hxx | 1
include/svtools/accessibleruler.hxx | 10
include/svtools/fmtfield.hxx | 7
include/svtools/svtabbx.hxx | 1
include/svx/dialcontrol.hxx | 1
include/svx/dlgctrl.hxx | 2
include/svx/langbox.hxx | 1
include/svx/txencbox.hxx | 5
include/svx/wrapfield.hxx | 1
include/xmloff/xmlimp.hxx | 6
oox/source/crypto/Standard2007Engine.cxx | 3
sc/Library_sc.mk | 1
sc/inc/docuno.hxx | 6
sc/inc/notesuno.hxx | 8
sc/source/core/data/document.cxx | 2
sc/source/core/data/postit.cxx | 18
sc/source/core/tool/compiler.cxx | 2
sc/source/filter/xml/xmlimprt.cxx | 6
sc/source/filter/xml/xmlimprt.hxx | 6
sc/source/ui/Accessibility/AccessibleCellBase.cxx | 4
sc/source/ui/dbgui/expftext.cxx | 83 --
sc/source/ui/inc/AccessibleCellBase.hxx | 5
sc/source/ui/inc/dbnamdlg.hxx | 1
sc/source/ui/inc/expftext.hxx | 39 -
sc/source/ui/inc/instbdlg.hxx | 1
sc/source/ui/inc/simpref.hxx | 1
sc/source/ui/inc/xmlsourcedlg.hxx | 1
sc/source/ui/sidebar/CellLineStyleValueSet.cxx | 5
sc/source/ui/sidebar/CellLineStyleValueSet.hxx | 2
sc/source/ui/unoobj/docuno.cxx | 6
sc/source/ui/unoobj/notesuno.cxx | 6
sd/source/ui/sidebar/LayoutMenu.cxx | 57 -
sd/source/ui/sidebar/LayoutMenu.hxx | 4
sfx2/source/control/recentdocsview.cxx | 6
sfx2/source/control/templatelocalview.cxx | 6
sfx2/source/dialog/basedlgs.cxx | 20
sfx2/source/dialog/tabdlg.cxx | 40 -
svtools/source/contnr/svtabbx.cxx | 12
svtools/source/control/accessibleruler.cxx | 16
svtools/source/control/fmtfield.cxx | 12
svx/source/dialog/connctrl.cxx | 4
svx/source/dialog/dialcontrol.cxx | 7
svx/source/dialog/dlgctrl.cxx | 18
svx/source/dialog/langbox.cxx | 9
svx/source/dialog/txencbox.cxx | 7
svx/source/dialog/wrapfield.cxx | 5
sw/inc/docsh.hxx | 3
sw/qa/extras/odfimport/odfimport.cxx | 5
sw/qa/extras/uiwriter/uiwriter.cxx | 1
sw/source/core/access/accpara.cxx | 60 --
sw/source/core/access/accpara.hxx | 1
sw/source/core/text/inftxt.cxx | 51 -
sw/source/core/text/inftxt.hxx | 14
sw/source/core/txtnode/atrfld.cxx | 5
sw/source/core/undo/unattr.cxx | 1
sw/source/core/unocore/unotext.cxx | 7
sw/source/filter/basflt/iodetect.cxx | 3
sw/source/filter/ww8/ww8par.cxx | 2
sw/source/ui/app/docsh.cxx | 18
sw/source/ui/app/docst.cxx | 24
sw/source/ui/app/docstyle.cxx | 6
ucb/source/core/FileAccess.cxx | 4
unusedcode.easy | 294 ++++++++--
vcl/qa/cppunit/canvasbitmaptest.cxx | 57 +
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 42 -
writerfilter/source/dmapper/StyleSheetTable.cxx | 2
xmloff/source/core/xmlimp.cxx | 6
89 files changed, 410 insertions(+), 837 deletions(-)
New commits:
commit ea3074e0beb7e0185205a70327e9ec47ec1f1028
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 10 11:05:47 2014 +0000
coverity#708829 Unused pointer value
Change-Id: Ia8815974467abb7342707fcd54174857f0a0aef7
diff --git a/svx/source/dialog/connctrl.cxx b/svx/source/dialog/connctrl.cxx
index f524d66..7ed4c86 100644
--- a/svx/source/dialog/connctrl.cxx
+++ b/svx/source/dialog/connctrl.cxx
@@ -144,12 +144,10 @@ void SvxXConnectionPreview::Construct()
if( nMarkCount >= 1 )
{
bool bFound = false;
- const SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
-
for( sal_uInt16 i = 0; i < nMarkCount && !bFound; i++ )
{
- pObj = rMarkList.GetMark( i )->GetMarkedSdrObj();
+ const SdrObject* pObj = rMarkList.GetMark( i )->GetMarkedSdrObj();
sal_uInt32 nInv = pObj->GetObjInventor();
sal_uInt16 nId = pObj->GetObjIdentifier();
if( nInv == SdrInventor && nId == OBJ_EDGE )
commit d6c590bb995aa8029e6fb3597081e8098d672789
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 10 11:04:06 2014 +0000
coverity#705268 Missing break in switch
Change-Id: I496b5be27a3817b05dd011a2c0973ce2fb639c3b
diff --git a/sw/source/core/undo/unattr.cxx b/sw/source/core/undo/unattr.cxx
index c5f1076..264d4fa 100644
--- a/sw/source/core/undo/unattr.cxx
+++ b/sw/source/core/undo/unattr.cxx
@@ -421,6 +421,7 @@ void SwUndoFmtAttr::SaveFlyAnchor( bool bSvDrwPt )
case FLY_AS_CHAR:
case FLY_AT_CHAR:
nCntnt = rAnchor.GetCntntAnchor()->nContent.GetIndex();
+ // fallthrough
case FLY_AT_PARA:
case FLY_AT_FLY:
m_nNodeIndex = rAnchor.GetCntntAnchor()->nNode.GetIndex();
commit 5ac9d90f0ab4877c391913a714befefb492fb42b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 10 11:02:57 2014 +0000
coverity#737167 Uncaught exception
Change-Id: Id1d9790b7d3229d11e83ad68a5b9104a3da159f0
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx
index a719fc7..a912bb8 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.cxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx
@@ -1323,7 +1323,9 @@ throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException
}
void ImageManagerImpl::storeToStorage( const uno::Reference< XStorage >& Storage )
-throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException)
+ throw (::com::sun::star::uno::Exception,
+ ::com::sun::star::uno::RuntimeException,
+ std::exception)
{
ResetableGuard aGuard( m_aLock );
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.hxx b/framework/source/uiconfiguration/imagemanagerimpl.hxx
index d406d79..0fa8e87 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.hxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.hxx
@@ -132,7 +132,10 @@ namespace framework
// XUIConfigurationPersistence
void reload() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
void store() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
- void storeToStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& Storage ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+ void storeToStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& Storage )
+ throw (::com::sun::star::uno::Exception,
+ ::com::sun::star::uno::RuntimeException,
+ std::exception);
sal_Bool isModified() throw (::com::sun::star::uno::RuntimeException);
sal_Bool isReadOnly() throw (::com::sun::star::uno::RuntimeException);
commit 32f34b488445b171d4b9761bf67aa6bc02e59093
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 10 11:00:35 2014 +0000
coverity#1027661 Explicit null dereferenced
Change-Id: I196bc592e3803a49096a640f2b8da2e1077dcc28
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index cb7462d..721f9b1 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -1746,8 +1746,8 @@ sal_Bool GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart,
const ImplControlValue& aValue,
const OUString& )
{
- OSL_ASSERT( aValue.getType() == CTRL_SCROLLBAR );
- const ScrollbarValue* pScrollbarVal = (aValue.getType() == CTRL_SCROLLBAR) ? static_cast<const ScrollbarValue*>(&aValue) : NULL;
+ assert(aValue.getType() == CTRL_SCROLLBAR);
+ const ScrollbarValue& rScrollbarVal = static_cast<const ScrollbarValue&>(aValue);
GdkPixmap* pixmap = NULL;
Rectangle pixmapRect, scrollbarRect;
GtkStateType stateType;
@@ -1756,11 +1756,11 @@ sal_Bool GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart,
GtkStyle * style;
GtkAdjustment* scrollbarValues = NULL;
GtkOrientation scrollbarOrientation;
- Rectangle thumbRect = pScrollbarVal->maThumbRect;
- Rectangle button11BoundRect = pScrollbarVal->maButton1Rect; // backward
- Rectangle button22BoundRect = pScrollbarVal->maButton2Rect; // forward
- Rectangle button12BoundRect = pScrollbarVal->maButton1Rect; // secondary forward
- Rectangle button21BoundRect = pScrollbarVal->maButton2Rect; // secondary backward
+ Rectangle thumbRect = rScrollbarVal.maThumbRect;
+ Rectangle button11BoundRect = rScrollbarVal.maButton1Rect; // backward
+ Rectangle button22BoundRect = rScrollbarVal.maButton2Rect; // forward
+ Rectangle button12BoundRect = rScrollbarVal.maButton1Rect; // secondary forward
+ Rectangle button21BoundRect = rScrollbarVal.maButton2Rect; // secondary backward
GtkArrowType button1Type; // backward
GtkArrowType button2Type; // forward
gchar * scrollbarTagH = (gchar *) "hscrollbar";
@@ -1912,16 +1912,16 @@ sal_Bool GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart,
scrollbarValues = GTK_ADJUSTMENT( gtk_adjustment_new(0, 0, 0, 0, 0, 0) );
if ( nPart == PART_DRAW_BACKGROUND_HORZ )
{
- scrollbarValues->lower = pScrollbarVal->mnMin;
- scrollbarValues->upper = pScrollbarVal->mnMax;
- scrollbarValues->value = pScrollbarVal->mnCur;
+ scrollbarValues->lower = rScrollbarVal.mnMin;
+ scrollbarValues->upper = rScrollbarVal.mnMax;
+ scrollbarValues->value = rScrollbarVal.mnCur;
scrollbarValues->page_size = scrollbarRect.GetWidth() / 2;
}
else
{
- scrollbarValues->lower = pScrollbarVal->mnMin;
- scrollbarValues->upper = pScrollbarVal->mnMax;
- scrollbarValues->value = pScrollbarVal->mnCur;
+ scrollbarValues->lower = rScrollbarVal.mnMin;
+ scrollbarValues->upper = rScrollbarVal.mnMax;
+ scrollbarValues->value = rScrollbarVal.mnCur;
scrollbarValues->page_size = scrollbarRect.GetHeight() / 2;
}
gtk_adjustment_changed( scrollbarValues );
@@ -1970,7 +1970,7 @@ sal_Bool GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart,
// ----------------- THUMB
if ( has_slider )
{
- NWConvertVCLStateToGTKState( pScrollbarVal->mnThumbState, &stateType, &shadowType );
+ NWConvertVCLStateToGTKState( rScrollbarVal.mnThumbState, &stateType, &shadowType );
gtk_paint_slider( style, gdkDrawable, stateType, GTK_SHADOW_OUT,
gdkRect, GTK_WIDGET(scrollbarWidget), "slider",
x+hShim+thumbRect.Left(), y+vShim+thumbRect.Top(),
@@ -1986,14 +1986,14 @@ sal_Bool GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart,
GTK_WIDGET(scrollbarWidget)->allocation.height = h;
bool backwardButtonInsensitive =
- pScrollbarVal->mnCur == pScrollbarVal->mnMin;
- bool forwardButtonInsensitive = pScrollbarVal->mnMax == 0 ||
- pScrollbarVal->mnCur + pScrollbarVal->mnVisibleSize >= pScrollbarVal->mnMax;
+ rScrollbarVal.mnCur == rScrollbarVal.mnMin;
+ bool forwardButtonInsensitive = rScrollbarVal.mnMax == 0 ||
+ rScrollbarVal.mnCur + rScrollbarVal.mnVisibleSize >= rScrollbarVal.mnMax;
// ----------------- BUTTON 1 //
if ( has_backward )
{
- NWConvertVCLStateToGTKState( pScrollbarVal->mnButton1State, &stateType, &shadowType );
+ NWConvertVCLStateToGTKState( rScrollbarVal.mnButton1State, &stateType, &shadowType );
if ( backwardButtonInsensitive )
stateType = GTK_STATE_INSENSITIVE;
gtk_paint_box( style, gdkDrawable, stateType, shadowType,
@@ -2009,7 +2009,7 @@ sal_Bool GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart,
}
if ( has_forward2 )
{
- NWConvertVCLStateToGTKState( pScrollbarVal->mnButton2State, &stateType, &shadowType );
+ NWConvertVCLStateToGTKState( rScrollbarVal.mnButton2State, &stateType, &shadowType );
if ( forwardButtonInsensitive )
stateType = GTK_STATE_INSENSITIVE;
gtk_paint_box( style, gdkDrawable, stateType, shadowType,
@@ -2026,7 +2026,7 @@ sal_Bool GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart,
// ----------------- BUTTON 2
if ( has_backward2 )
{
- NWConvertVCLStateToGTKState( pScrollbarVal->mnButton1State, &stateType, &shadowType );
+ NWConvertVCLStateToGTKState( rScrollbarVal.mnButton1State, &stateType, &shadowType );
if ( backwardButtonInsensitive )
stateType = GTK_STATE_INSENSITIVE;
gtk_paint_box( style, gdkDrawable, stateType, shadowType, gdkRect,
@@ -2042,7 +2042,7 @@ sal_Bool GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart,
}
if ( has_forward )
{
- NWConvertVCLStateToGTKState( pScrollbarVal->mnButton2State, &stateType, &shadowType );
+ NWConvertVCLStateToGTKState( rScrollbarVal.mnButton2State, &stateType, &shadowType );
if ( forwardButtonInsensitive )
stateType = GTK_STATE_INSENSITIVE;
gtk_paint_box( style, gdkDrawable, stateType, shadowType, gdkRect,
commit 08b40114c02eab26e5c6c11fbd0d5759fab2d358
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 10 10:56:26 2014 +0000
coverity#1038334 Uncaught exception
Change-Id: I590d5fb8250de07c879b27ad69398a80949845c7
diff --git a/sc/source/ui/Accessibility/AccessibleCellBase.cxx b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
index e63efe4..ccabfbc 100644
--- a/sc/source/ui/Accessibility/AccessibleCellBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
@@ -225,8 +225,8 @@ OUString SAL_CALL
//===== XAccessibleValue ================================================
uno::Any SAL_CALL
- ScAccessibleCellBase::getCurrentValue( )
- throw (uno::RuntimeException)
+ ScAccessibleCellBase::getCurrentValue()
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
IsObjectValid();
diff --git a/sc/source/ui/inc/AccessibleCellBase.hxx b/sc/source/ui/inc/AccessibleCellBase.hxx
index 66f0fc7..8bc9717 100644
--- a/sc/source/ui/inc/AccessibleCellBase.hxx
+++ b/sc/source/ui/inc/AccessibleCellBase.hxx
@@ -89,8 +89,9 @@ public:
///===== XAccessibleValue ================================================
virtual ::com::sun::star::uno::Any SAL_CALL
- getCurrentValue( )
- throw (::com::sun::star::uno::RuntimeException);
+ getCurrentValue()
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual sal_Bool SAL_CALL
setCurrentValue( const ::com::sun::star::uno::Any& aNumber )
commit 1439c0de1b1bdb25426a68357da75b20ebe0d9e5
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 10 10:53:58 2014 +0000
coverity#1078996 Uncaught exception
Change-Id: Ib1a50408016c61c9ddd26c74e22810567009996e
diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx
index 907f202..e6f53f7 100644
--- a/sc/inc/docuno.hxx
+++ b/sc/inc/docuno.hxx
@@ -426,7 +426,8 @@ public:
std::exception);
virtual void SAL_CALL copyByName( const OUString& aName,
const OUString& aCopy, sal_Int16 nDestination )
- throw(::com::sun::star::uno::RuntimeException);
+ throw(::com::sun::star::uno::RuntimeException,
+ std::exception);
/// XSpreadsheets2
virtual sal_Int32 SAL_CALL importSheet(
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 6144d7f..89cb922 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -2572,8 +2572,8 @@ void SAL_CALL ScTableSheetsObj::moveByName( const OUString& aName, sal_Int16 nDe
}
void SAL_CALL ScTableSheetsObj::copyByName( const OUString& aName,
- const OUString& aCopy, sal_Int16 nDestination )
- throw(uno::RuntimeException)
+ const OUString& aCopy, sal_Int16 nDestination )
+ throw(uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
sal_Bool bDone = false;
commit 8c002d6f1a50b6f0c6fe6cb3f25d426f6196e259
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 10 10:53:10 2014 +0000
coverity#1078997 Uncaught exception
Change-Id: I033d80c991f2bf26cd0a00466c2f8b5cc55f7906
diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx
index 7c8b5ad..907f202 100644
--- a/sc/inc/docuno.hxx
+++ b/sc/inc/docuno.hxx
@@ -422,7 +422,8 @@ public:
virtual void SAL_CALL insertNewByName( const OUString& aName, sal_Int16 nPosition )
throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL moveByName( const OUString& aName, sal_Int16 nDestination )
- throw(::com::sun::star::uno::RuntimeException);
+ throw(::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL copyByName( const OUString& aName,
const OUString& aCopy, sal_Int16 nDestination )
throw(::com::sun::star::uno::RuntimeException);
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index e6ad2a8..6144d7f 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -2557,7 +2557,7 @@ void SAL_CALL ScTableSheetsObj::insertNewByName( const OUString& aName, sal_Int1
}
void SAL_CALL ScTableSheetsObj::moveByName( const OUString& aName, sal_Int16 nDestination )
- throw(uno::RuntimeException)
+ throw(uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
sal_Bool bDone = false;
commit cdddbf1991c021e0ee433ed6371e1e7a83e6877a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 10 10:50:36 2014 +0000
coverity#1079007 Uncaught exception
Change-Id: Ic4b1805809aa0a2a78007d5808fd8ae6097b080f
diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx
index 2628e39..5b5ee9a 100644
--- a/include/xmloff/xmlimp.hxx
+++ b/include/xmloff/xmlimp.hxx
@@ -197,8 +197,10 @@ public:
// ::com::sun::star::xml::sax::XDocumentHandler
virtual void SAL_CALL startDocument(void)
throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException );
- virtual void SAL_CALL endDocument(void)
- throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException );
+ virtual void SAL_CALL endDocument()
+ throw(::com::sun::star::xml::sax::SAXException,
+ ::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL startElement(const OUString& aName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttribs)
throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException );
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index abfe32a..6314b85 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -3177,8 +3177,10 @@ void ScXMLImport::SetSheetNamedRanges()
}
}
-void SAL_CALL ScXMLImport::endDocument(void)
-throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException )
+void SAL_CALL ScXMLImport::endDocument()
+ throw(::com::sun::star::xml::sax::SAXException,
+ ::com::sun::star::uno::RuntimeException,
+ std::exception)
{
ScXMLImport::MutexGuard aGuard(*this);
if (getImportFlags() & IMPORT_CONTENT)
diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx
index 1645c32..4265b80 100644
--- a/sc/source/filter/xml/xmlimprt.hxx
+++ b/sc/source/filter/xml/xmlimprt.hxx
@@ -1178,8 +1178,10 @@ public:
virtual void SAL_CALL startDocument(void)
throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException );
- virtual void SAL_CALL endDocument(void)
- throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException );
+ virtual void SAL_CALL endDocument()
+ throw(::com::sun::star::xml::sax::SAXException,
+ ::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void DisposingModel();
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 001970b..bb88bfb 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -502,8 +502,10 @@ void SAL_CALL SvXMLImport::startDocument( void )
}
}
-void SAL_CALL SvXMLImport::endDocument( void )
- throw( xml::sax::SAXException, uno::RuntimeException)
+void SAL_CALL SvXMLImport::endDocument()
+ throw(xml::sax::SAXException,
+ uno::RuntimeException,
+ std::exception)
{
SAL_INFO( "xmloff.core", "} SvXMLImport::startDocument" );
// #i9518# All the stuff that accesses the document has to be done here, not in the dtor,
commit 02386ef8bcaeaca72eae56e15fe526aa9fc29b40
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 10 10:48:41 2014 +0000
coverity#1079288 Uninitialized scalar field
Change-Id: I0fb9e547b73b563725eb8014f68224706df3c39d
diff --git a/oox/source/crypto/Standard2007Engine.cxx b/oox/source/crypto/Standard2007Engine.cxx
index 13697d2..29f1e14 100644
--- a/oox/source/crypto/Standard2007Engine.cxx
+++ b/oox/source/crypto/Standard2007Engine.cxx
@@ -51,8 +51,9 @@ EncryptionStandardHeader::EncryptionStandardHeader()
}
EncryptionVerifierAES::EncryptionVerifierAES()
+ : saltSize(SALT_LENGTH)
+ , encryptedVerifierHashSize(RTL_DIGEST_LENGTH_SHA1)
{
- saltSize = SALT_LENGTH;
memset(salt, 0, sizeof(salt));
memset(encryptedVerifier, 0, sizeof(encryptedVerifier));
memset(encryptedVerifierHash, 0, sizeof(encryptedVerifierHash));
commit 4a8a30f941ea4324e6319db0d92e5290e9be225d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 10 10:43:59 2014 +0000
coverity#1130183 Logically dead code
Change-Id: I0bb684634b176769360aaa1c4471274da9797a44
diff --git a/sw/source/filter/basflt/iodetect.cxx b/sw/source/filter/basflt/iodetect.cxx
index 2e3f72e..8472e33 100644
--- a/sw/source/filter/basflt/iodetect.cxx
+++ b/sw/source/filter/basflt/iodetect.cxx
@@ -280,9 +280,6 @@ const SfxFilter* SwIoSystem::GetFileFilter(const OUString& rFileName,
SfxFilterContainer aCntSwWeb( OUString(sSWRITERWEB) );
const SfxFilterContainer* pFCntnr = IsDocShellRegistered() ? &aCntSw : &aCntSwWeb;
- if( !pFCntnr )
- return 0;
-
SfxFilterMatcher aMatcher( pFCntnr->GetName() );
SfxFilterMatcherIter aIter( aMatcher );
const SfxFilter* pFilter = aIter.First();
commit dfcd09f7749ec86af2251e777c989e42eca68cf4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 10 10:42:59 2014 +0000
coverity#1130193 Dereference after null check
Change-Id: I38078c01f8ac37735784508664dfe31aa8f7cf3a
diff --git a/ucb/source/core/FileAccess.cxx b/ucb/source/core/FileAccess.cxx
index 4394ae1..c9a1674 100644
--- a/ucb/source/core/FileAccess.cxx
+++ b/ucb/source/core/FileAccess.cxx
@@ -588,7 +588,7 @@ Reference< XStream > OFileAccess::openFileReadWrite( const OUString& FileURL )
}
catch ( InteractiveIOException const & e )
{
- if ( xIH.is() )
+ if ( xIH.is() && mpEnvironment )
mpEnvironment->setHandler( xIH );
if ( e.Code == IOErrorCode_NOT_EXISTING )
@@ -611,7 +611,7 @@ Reference< XStream > OFileAccess::openFileReadWrite( const OUString& FileURL )
throw;
}
- if ( xIH.is() )
+ if ( xIH.is() && mpEnvironment )
mpEnvironment->setHandler( xIH );
Reference< XStream > xRet = xSink->getStream();
commit 4d6f797e6c0214526f73dd3df1605126ffbd1063
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 10 10:41:14 2014 +0000
coverity#1130196 Unchecked dynamic_cast
Change-Id: I194ad965c5261e1968cc3cb24e1609d46aea1a21
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 47cba7b..ba9c9f3 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -954,7 +954,7 @@ void StyleSheetTable::ApplyStyleSheets( FontTablePtr rFontTable )
xStyle.set(xStyles->getByName(sConvertedStyleName), uno::UNO_QUERY_THROW);
StyleSheetPropertyMap* pPropertyMap = dynamic_cast<StyleSheetPropertyMap*>(pEntry->pProperties.get());
- if (pPropertyMap->GetListId() == -1)
+ if (pPropertyMap && pPropertyMap->GetListId() == -1)
{
// No properties? Word default is 'none', Writer one is 'arabic', handle this.
uno::Reference<beans::XPropertySet> xPropertySet(xStyle, uno::UNO_QUERY_THROW);
commit dd4f18218e5af90672627a7bb50478b34096a87b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 10 10:39:44 2014 +0000
coverity#1130350 Dereference after null check
Change-Id: I14c64f42b469450221791f0f136167b58df2f15d
diff --git a/sw/source/ui/app/docst.cxx b/sw/source/ui/app/docst.cxx
index 306206c..21a219a 100644
--- a/sw/source/ui/app/docst.cxx
+++ b/sw/source/ui/app/docst.cxx
@@ -637,7 +637,7 @@ sal_uInt16 SwDocShell::Edit(
assigned" paragraph style, the outline level attribute and the list
style attribute of the new paragraph style have to be set to 0
respectively "".*/
- if( pColl->IsAssignedToListLevelOfOutlineStyle())
+ if (pColl && pColl->IsAssignedToListLevelOfOutlineStyle())
{
SwNumRuleItem aItem(aEmptyOUStr);
pDStyle->GetCollection()->SetFmtAttr( aItem );
commit 566564b579c7dbe8df7fbe9c02cb6410738256f7
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 10 10:38:42 2014 +0000
coverity#1130352 Unchecked dynamic_cast
Change-Id: I62f0e632e37a9b532248cd9c632d6cbc626045d0
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index e978d76..9e584e1 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -3043,7 +3043,7 @@ bool SwWW8ImplReader::ReadPlainChars(WW8_CP& rPos, sal_Int32 nEnd, sal_Int32 nCp
sal_uInt16 nCTLLang = 0;
const SfxPoolItem * pItem = GetFmtAttr(RES_CHRATR_CTL_LANGUAGE);
if (pItem != NULL)
- nCTLLang = dynamic_cast<const SvxLanguageItem *>(pItem)->GetLanguage();
+ nCTLLang = static_cast<const SvxLanguageItem *>(pItem)->GetLanguage();
sal_Int32 nL2;
for( nL2 = 0; nL2 < nStrLen; ++nL2, ++pWork )
commit b74f9e31b20d055b6a63865742a2c472718c8bdc
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 10 10:37:49 2014 +0000
coverity#1130361 Unchecked dynamic_cast
Change-Id: I2c93a085fe55098777ae7b41953f2610903b5a54
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx
index 080b879..6df7426 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -49,6 +49,7 @@ SwDoc* SwUiWriterTest::createDoc(const char* pName)
load(DATA_DIRECTORY, pName);
SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
+ CPPUNIT_ASSERT(pTxtDoc);
return pTxtDoc->GetDocShell()->GetDoc();
}
commit 758cf90bdb38bba826fa867783fef9d4dc056875
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 10 10:37:12 2014 +0000
coverity#1130362 Unchecked dynamic_cast
Change-Id: I58d9c7e933152e0d8ca69125572c820b8dbe7405
diff --git a/sw/qa/extras/odfimport/odfimport.cxx b/sw/qa/extras/odfimport/odfimport.cxx
index 0a79820..8f7f8a7 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -425,6 +425,7 @@ DECLARE_ODFIMPORT_TEST(testFdo69979, "fdo69979.odt")
DECLARE_ODFIMPORT_TEST(testSpellmenuRedline, "spellmenu-redline.odt")
{
SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
+ CPPUNIT_ASSERT(pTxtDoc);
SwWrtShell* pWrtShell = pTxtDoc->GetDocShell()->GetWrtShell();
OUString aParaText;
uno::Reference<linguistic2::XSpellAlternatives> xAlt;
commit 74dd647e764fada2bb52fb3544d20ec019ad2e69
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 10 10:36:41 2014 +0000
coverity#1130363 Unchecked dynamic_cast
Change-Id: Ibc1e6f5e7c7f2a0546847194de5f77ab51b2d578
diff --git a/sw/qa/extras/odfimport/odfimport.cxx b/sw/qa/extras/odfimport/odfimport.cxx
index f534a09..0a79820 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -366,6 +366,7 @@ DECLARE_ODFIMPORT_TEST(testFdo37606, "fdo37606.odt")
DECLARE_ODFIMPORT_TEST(testFdo37606Copy, "fdo37606.odt")
{
SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
+ CPPUNIT_ASSERT(pTxtDoc);
SwWrtShell* pWrtShell = pTxtDoc->GetDocShell()->GetWrtShell();
// Ctrl-A
pWrtShell->SelAll();
commit c02e3b47affb078a59cf28abf20ea6b050549574
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 10 10:36:17 2014 +0000
coverity#1130364 Unchecked dynamic_cast
Change-Id: Ic8eab1630b79b49b67646eea52b26e0f24fd2d49
diff --git a/sw/qa/extras/odfimport/odfimport.cxx b/sw/qa/extras/odfimport/odfimport.cxx
index 1710315..f534a09 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -408,6 +408,7 @@ DECLARE_ODFIMPORT_TEST(testFdo69979, "fdo69979.odt")
{
// The test doc is special in that it starts with a table and it also has a header.
SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
+ CPPUNIT_ASSERT(pTxtDoc);
SwWrtShell* pWrtShell = pTxtDoc->GetDocShell()->GetWrtShell();
SwShellCrsr* pShellCrsr = pWrtShell->getShellCrsr(false);
commit 778e88e86384e22852eb412c4f9af4494b2f0c3a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 10 10:35:50 2014 +0000
coverity#1130365 Unchecked dynamic_cast
Change-Id: I1298d220c42aa7282cdc6c256727620ee1a6f749
diff --git a/sw/qa/extras/odfimport/odfimport.cxx b/sw/qa/extras/odfimport/odfimport.cxx
index 224ed9d..1710315 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -391,6 +391,7 @@ DECLARE_ODFIMPORT_TEST(testFdo69862, "fdo69862.odt")
{
// The test doc is special in that it starts with a table and it also has a footnote.
SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
+ CPPUNIT_ASSERT(pTxtDoc);
SwWrtShell* pWrtShell = pTxtDoc->GetDocShell()->GetWrtShell();
SwShellCrsr* pShellCrsr = pWrtShell->getShellCrsr(false);
commit 87015e5433d9c6575f07b5a81e4ffa6e1e4831d2
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 10 10:35:23 2014 +0000
coverity#1130366 Unchecked dynamic_cast
Change-Id: Icf7576b12fe3c876193fd87ce07c18e57a3dfad7
diff --git a/sw/qa/extras/odfimport/odfimport.cxx b/sw/qa/extras/odfimport/odfimport.cxx
index a72d643..224ed9d 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -327,6 +327,7 @@ DECLARE_ODFIMPORT_TEST(testFdo68839, "fdo68839.odt")
DECLARE_ODFIMPORT_TEST(testFdo37606, "fdo37606.odt")
{
SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
+ CPPUNIT_ASSERT(pTxtDoc);
SwWrtShell* pWrtShell = pTxtDoc->GetDocShell()->GetWrtShell();
SwShellCrsr* pShellCrsr = pWrtShell->getShellCrsr(false);
commit a90746cb651fed676b2189154a6b6724cb987526
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 10 10:33:48 2014 +0000
coverity#1130368 Unchecked dynamic_cast
Change-Id: Ib4ae0ce1647e15bf1b9d7fe8e2d3bcfcb8ec1466
diff --git a/sfx2/source/control/recentdocsview.cxx b/sfx2/source/control/recentdocsview.cxx
index 34ae603..0592358 100644
--- a/sfx2/source/control/recentdocsview.cxx
+++ b/sfx2/source/control/recentdocsview.cxx
@@ -236,11 +236,13 @@ void RecentDocsView::OnItemDblClicked(ThumbnailViewItem *pItem)
void RecentDocsView::OpenItem( const ThumbnailViewItem *pItem )
{
+ const RecentDocsViewItem* pRecentItem = dynamic_cast<const RecentDocsViewItem*>(pItem);
+ if (!pRecentItem)
+ return;
+
// show busy mouse pointer
SetPointer(Pointer(POINTER_WAIT));
- const RecentDocsViewItem* pRecentItem = dynamic_cast<const RecentDocsViewItem*>(pItem);
-
Reference< XDispatch > xDispatch;
Reference< XDispatchProvider > xDispatchProvider;
css::util::URL aTargetURL;
commit 984875f8da5766bb0eaae5a1b9f11ccc4491d066
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 10 10:31:27 2014 +0000
coverity#1130377 Unchecked dynamic_cast
Change-Id: I6cb816ec3de711f4faec0e9d676fa9e1127ad175
diff --git a/sw/source/core/txtnode/atrfld.cxx b/sw/source/core/txtnode/atrfld.cxx
index 7481b4a..32e400d 100644
--- a/sw/source/core/txtnode/atrfld.cxx
+++ b/sw/source/core/txtnode/atrfld.cxx
@@ -161,7 +161,7 @@ void SwFmtFld::SetField(SwField * _pField)
mpField = _pField;
if ( GetField()->GetTyp()->Which() == RES_INPUTFLD )
{
- dynamic_cast<SwInputField* >(GetField())->SetFmtFld( *this );
+ static_cast<SwInputField* >(GetField())->SetFmtFld( *this );
}
Broadcast( SwFmtFldHint( this, SWFMTFLD_CHANGED ) );
}
@@ -238,8 +238,7 @@ void SwFmtFld::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
if( RES_GETREFFLD == GetField()->GetTyp()->Which() )
{
// #i81002#
-// ((SwGetRefField*)GetFld())->UpdateField();
- dynamic_cast<SwGetRefField*>(GetField())->UpdateField( mpTxtFld );
+ static_cast<SwGetRefField*>(GetField())->UpdateField( mpTxtFld );
}
break;
case RES_DOCPOS_UPDATE:
commit a434a8bfdd8b9323c8262edcd591641fe9ea8b19
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 10 10:26:04 2014 +0000
coverity#1130423 Dereference null return value
Change-Id: If6981a9654a114e34dad931381ea071d5169adc2
diff --git a/sw/source/ui/app/docst.cxx b/sw/source/ui/app/docst.cxx
index 0b8a632..306206c 100644
--- a/sw/source/ui/app/docst.cxx
+++ b/sw/source/ui/app/docst.cxx
@@ -1164,19 +1164,23 @@ sal_uInt16 SwDocShell::MakeByExample( const OUString &rName, sal_uInt16 nFamily,
case SFX_STYLE_FAMILY_PSEUDO:
{
- pCurrWrtShell->StartAllAction();
+ const SwNumRule* pCurRule = pCurrWrtShell->GetCurNumRule();
- SwNumRule aRule( *pCurrWrtShell->GetCurNumRule() );
- OUString sOrigRule( aRule.GetName() );
- // #i91400#
- aRule.SetName( pStyle->GetNumRule()->GetName(),
- *(pCurrWrtShell->GetDoc()) );
- pCurrWrtShell->ChgNumRuleFmts( aRule );
+ if (pCurRule)
+ {
+ pCurrWrtShell->StartAllAction();
- pCurrWrtShell->ReplaceNumRule( sOrigRule, aRule.GetName() );
+ SwNumRule aRule( *pCurRule );
+ OUString sOrigRule( aRule.GetName() );
+ // #i91400#
+ aRule.SetName( pStyle->GetNumRule()->GetName(),
+ *(pCurrWrtShell->GetDoc()) );
+ pCurrWrtShell->ChgNumRuleFmts( aRule );
+ pCurrWrtShell->ReplaceNumRule( sOrigRule, aRule.GetName() );
- pCurrWrtShell->EndAllAction();
+ pCurrWrtShell->EndAllAction();
+ }
}
break;
}
commit de969207a606d0967bfa8a5dd7b2f180f8511f83
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 10 10:24:13 2014 +0000
coverity#1130425 Dereference null return value
Change-Id: I84cb15bdfe5836bbaa5c4a24572987d6ab51cdd0
diff --git a/sw/source/ui/app/docstyle.cxx b/sw/source/ui/app/docstyle.cxx
index 1bf5c7a8..8ea1db9 100644
--- a/sw/source/ui/app/docstyle.cxx
+++ b/sw/source/ui/app/docstyle.cxx
@@ -483,11 +483,13 @@ void SwDocStyleSheet::GetGrabBagItem(uno::Any& rVal) const
{
case SFX_STYLE_FAMILY_CHAR:
pFmt = rDoc.FindCharFmtByName(aName);
- pFmt->GetGrabBagItem(rVal);
+ if (pFmt)
+ pFmt->GetGrabBagItem(rVal);
break;
case SFX_STYLE_FAMILY_PARA:
pFmt = rDoc.FindTxtFmtCollByName(aName);
- pFmt->GetGrabBagItem(rVal);
+ if (pFmt)
+ pFmt->GetGrabBagItem(rVal);
break;
case SFX_STYLE_FAMILY_PSEUDO:
{
commit 7cfc6821a6ab0e26c03730ab671f31eb690aacca
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 10 10:21:18 2014 +0000
coverity#1130439 Dereference before null check
Change-Id: Ic0adacb785653e77f5031f6b6f499a7191765599
diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx
index 11064f0..6a980d1 100644
--- a/sc/source/core/data/postit.cxx
+++ b/sc/source/core/data/postit.cxx
@@ -923,8 +923,6 @@ ScPostIt* ScNoteUtil::CreateNoteFromString(
pNote->AutoStamp();
//insert takes ownership
rDoc.SetNote(rPos, pNote);
- if(!pNote)
- pNote = NULL;
}
return pNote;
}
commit bde55e18ca1d75fa56833a19d8ceeb75e84d9608
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 10 10:20:36 2014 +0000
coverity#1130440 Dereference before null check
Change-Id: Iacd645d9cc002546a85eca619a42e292b45c8072
diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx
index 4922b1e..11064f0 100644
--- a/sc/source/core/data/postit.cxx
+++ b/sc/source/core/data/postit.cxx
@@ -863,15 +863,10 @@ ScPostIt* ScNoteUtil::CreateNoteFromCaption(
ScPostIt* pNote = new ScPostIt( rDoc, rPos, aNoteData, false );
pNote->AutoStamp();
- // if pNote still points to the note after TakeNote(), insertion was successful
rDoc.SetNote(rPos, pNote);
- if( pNote )
- {
- // ScNoteCaptionCreator c'tor updates the caption object to be part of a note
- ScNoteCaptionCreator aCreator( rDoc, rPos, rCaption, bShown );
- }
- else
- return NULL;
+
+ // ScNoteCaptionCreator c'tor updates the caption object to be part of a note
+ ScNoteCaptionCreator aCreator( rDoc, rPos, rCaption, bShown );
return pNote;
}
commit 4817ee4f6f15a24b0a3f695111ff417de595882e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 10 10:19:01 2014 +0000
coverity#1130441 Dereference before null check
Change-Id: I619cc45eccda4da9f9cb88028a3174d67e7011f9
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index fdbb1fa..0f24c23 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -6165,7 +6165,7 @@ void ScDocument::SetNote(const ScAddress& rPos, ScPostIt* pNote)
void ScDocument::SetNote(SCCOL nCol, SCROW nRow, SCTAB nTab, ScPostIt* pNote)
{
- return maTabs[nTab]->aCol[nCol].SetCellNote(nRow, pNote);
+ return maTabs[nTab]->aCol[nCol].SetCellNote(nRow, pNote);
}
bool ScDocument::HasNote(const ScAddress& rPos)
diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx
index 374d546..4922b1e 100644
--- a/sc/source/core/data/postit.cxx
+++ b/sc/source/core/data/postit.cxx
@@ -906,10 +906,7 @@ ScPostIt* ScNoteUtil::CreateNoteFromObjectData(
rDoc.SetNote(rPos, pNote);
- if(pNote)
- return pNote;
- else
- return NULL;
+ return pNote;
}
ScPostIt* ScNoteUtil::CreateNoteFromString(
commit 7afef62b72e91cff4d9684e6e717c9b03a37caf1
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 10 10:16:58 2014 +0000
coverity#1130442 Dereference before null check
Change-Id: I5c072ffea7c3a712549f9a9dbb8b7145fbab7d38
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index eae1856..03be402 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -1553,7 +1553,7 @@ ScCompiler::ScCompiler( ScDocument* pDocument, const ScAddress& rPos,ScTokenArra
mbCloseBrackets( true ),
mbRewind( false )
{
- nMaxTab = pDoc ? pDoc->GetTableCount() - 1 : 0;
+ nMaxTab = pDoc->GetTableCount() - 1;
}
ScCompiler::ScCompiler( sc::CompileFormulaContext& rCxt, const ScAddress& rPos ) :
commit 085c9ae576b22f1aff852191bae72bfdd97f24e3
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 10 10:16:15 2014 +0000
coverity#1130444 Uncaught exception
Change-Id: I129edc36f0049e34d3f7b23b52bc943071938ee6
diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index 23b91b3..51a24c00 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -1327,7 +1327,7 @@ SwXText::Impl::finishOrAppendParagraph(
sMessage = rRuntime.Message;
bRuntimeException = true;
}
- catch (const beans::UnknownPropertyException& rEx)
+ catch (const uno::Exception& rEx)
{
sMessage = rEx.Message;
bRuntimeException = true;
commit db25691185288a13daf4bf392ae8a641e9ef7050
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 10 10:15:13 2014 +0000
coverity#1130445 Uncaught exception
Change-Id: I5ccf654d60f277c43c19032867ce0a940738c73a
diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index 6ce00e9..23b91b3 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -1267,7 +1267,7 @@ SwXText::Impl::finishOrAppendParagraph(
const bool bFinish,
const uno::Sequence< beans::PropertyValue > & rProperties,
const uno::Reference< text::XTextRange >& xInsertPosition)
-throw (lang::IllegalArgumentException, uno::RuntimeException)
+ throw (lang::IllegalArgumentException, uno::RuntimeException)
{
if (!m_bIsValid)
{
@@ -1327,6 +1327,11 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
sMessage = rRuntime.Message;
bRuntimeException = true;
}
+ catch (const beans::UnknownPropertyException& rEx)
+ {
+ sMessage = rEx.Message;
+ bRuntimeException = true;
+ }
m_pDoc->GetIDocumentUndoRedo().EndUndo(UNDO_END, NULL);
if (bIllegalException || bRuntimeException)
commit 4adf4379aa908b987a5e1138df91dbcf80ed7572
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 10 10:12:43 2014 +0000
coverity#1130447 Uncaught exception
Change-Id: Icb55ad131c9e69264b3cf1ed4d7220002816036d
diff --git a/vcl/qa/cppunit/canvasbitmaptest.cxx b/vcl/qa/cppunit/canvasbitmaptest.cxx
index 0ebc9a6..17208ba 100644
--- a/vcl/qa/cppunit/canvasbitmaptest.cxx
+++ b/vcl/qa/cppunit/canvasbitmaptest.cxx
@@ -429,8 +429,10 @@ private:
return uno::Sequence< double >();
}
- virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertToRGB( const uno::Sequence< double >& ) throw (lang::IllegalArgumentException,
- uno::RuntimeException)
+ virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertToRGB( const uno::Sequence< double >& )
+ throw (lang::IllegalArgumentException,
+ uno::RuntimeException,
+ std::exception)
{
CPPUNIT_ASSERT_MESSAGE("convertToRGB: method not implemented", false);
return uno::Sequence< rendering::RGBColor >();
commit 5852f3471777e2c4ff176a764757d821bca78f23
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 10 10:12:13 2014 +0000
coverity#1130448 Uncaught exception
Change-Id: Ie0b0418191a47e89c9535d6f13c09e15e634a4b9
diff --git a/vcl/qa/cppunit/canvasbitmaptest.cxx b/vcl/qa/cppunit/canvasbitmaptest.cxx
index ca03900..0ebc9a6 100644
--- a/vcl/qa/cppunit/canvasbitmaptest.cxx
+++ b/vcl/qa/cppunit/canvasbitmaptest.cxx
@@ -436,8 +436,10 @@ private:
return uno::Sequence< rendering::RGBColor >();
}
- virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToARGB( const uno::Sequence< double >& ) throw (lang::IllegalArgumentException,
- uno::RuntimeException)
+ virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToARGB( const uno::Sequence< double >& )
+ throw (lang::IllegalArgumentException,
+ uno::RuntimeException,
+ std::exception)
{
CPPUNIT_ASSERT_MESSAGE("convertToARGB: method not implemented", false);
return uno::Sequence< rendering::ARGBColor >();
commit a00f5c01310fead4a1ba6ff964686108e83be63b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 10 10:11:39 2014 +0000
coverity#1130449 Uncaught exception
Change-Id: I3d357d1346da173f0ee40b6b316e26d7f75bd4d5
diff --git a/vcl/qa/cppunit/canvasbitmaptest.cxx b/vcl/qa/cppunit/canvasbitmaptest.cxx
index 1bd9d74..ca03900 100644
--- a/vcl/qa/cppunit/canvasbitmaptest.cxx
+++ b/vcl/qa/cppunit/canvasbitmaptest.cxx
@@ -412,7 +412,9 @@ private:
return rendering::RenderingIntent::PERCEPTUAL;
}
- virtual uno::Sequence< beans::PropertyValue > SAL_CALL getProperties( ) throw (uno::RuntimeException)
+ virtual uno::Sequence< beans::PropertyValue > SAL_CALL getProperties()
+ throw (uno::RuntimeException,
+ std::exception)
{
CPPUNIT_ASSERT_MESSAGE("getProperties: method not implemented", false );
return uno::Sequence< ::beans::PropertyValue >();
commit 6165535dc95f4868c86e3c71724c2f29b12ef292
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 10 10:11:08 2014 +0000
coverity#1130450 Uncaught exception
Change-Id: I0155c6baafc302984a9af17434ec23b37606aa22
diff --git a/vcl/qa/cppunit/canvasbitmaptest.cxx b/vcl/qa/cppunit/canvasbitmaptest.cxx
index b86507e..1bd9d74 100644
--- a/vcl/qa/cppunit/canvasbitmaptest.cxx
+++ b/vcl/qa/cppunit/canvasbitmaptest.cxx
@@ -450,8 +450,10 @@ private:
return uno::Sequence< rendering::ARGBColor >();
}
- virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& ) throw (lang::IllegalArgumentException,
- uno::RuntimeException)
+ virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& )
+ throw (lang::IllegalArgumentException,
+ uno::RuntimeException,
+ std::exception)
{
CPPUNIT_ASSERT_MESSAGE("convertFromRGB: method not implemented", false);
return uno::Sequence< double >();
commit 2ce3912cab85e58c5addb0999e8b45b70ad22d1d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 10 10:10:33 2014 +0000
coverity#1130451 Uncaught exception
Change-Id: Id26567c2f2aceca2b681dfbc6a4de493fa331f3d
diff --git a/vcl/qa/cppunit/canvasbitmaptest.cxx b/vcl/qa/cppunit/canvasbitmaptest.cxx
index be88284..b86507e 100644
--- a/vcl/qa/cppunit/canvasbitmaptest.cxx
+++ b/vcl/qa/cppunit/canvasbitmaptest.cxx
@@ -441,8 +441,10 @@ private:
return uno::Sequence< rendering::ARGBColor >();
}
- virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& ) throw (lang::IllegalArgumentException,
- uno::RuntimeException)
+ virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& )
+ throw (lang::IllegalArgumentException,
+ uno::RuntimeException,
+ std::exception)
{
CPPUNIT_ASSERT_MESSAGE("convertToPARGB: method not implemented", false);
return uno::Sequence< rendering::ARGBColor >();
commit 517613241d2d961c8edbb732f494821263c38e90
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 10 10:09:52 2014 +0000
coverity#1130452 Uncaught exception
Change-Id: I700a73af9f25ea92a45c0f9218c4267fc885773e
diff --git a/vcl/qa/cppunit/canvasbitmaptest.cxx b/vcl/qa/cppunit/canvasbitmaptest.cxx
index 9ade183b6..be88284 100644
--- a/vcl/qa/cppunit/canvasbitmaptest.cxx
+++ b/vcl/qa/cppunit/canvasbitmaptest.cxx
@@ -455,8 +455,10 @@ private:
return uno::Sequence< double >();
}
- virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& ) throw (lang::IllegalArgumentException,
- uno::RuntimeException)
+ virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& )
+ throw (lang::IllegalArgumentException,
+ uno::RuntimeException,
+ std::exception)
{
CPPUNIT_ASSERT_MESSAGE("convertFromARGB: this method is not expected to be called!", false);
return uno::Sequence< double >();
commit 7cc3998290a63db6beb6af1bbbd4860e5100fe5f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 10 10:09:15 2014 +0000
coverity#1130453 Uncaught exception
Change-Id: I54f868c7ab88b3a9be0b91fcceee95d522a6b2f8
diff --git a/vcl/qa/cppunit/canvasbitmaptest.cxx b/vcl/qa/cppunit/canvasbitmaptest.cxx
index ccae63c..9ade183b6 100644
--- a/vcl/qa/cppunit/canvasbitmaptest.cxx
+++ b/vcl/qa/cppunit/canvasbitmaptest.cxx
@@ -462,8 +462,10 @@ private:
return uno::Sequence< double >();
}
- virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& ) throw (lang::IllegalArgumentException,
- uno::RuntimeException)
+ virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& )
+ throw (lang::IllegalArgumentException,
+ uno::RuntimeException,
+ std::exception)
{
CPPUNIT_ASSERT_MESSAGE("convertFromPARGB: this method is not expected to be called!", false);
return uno::Sequence< double >();
commit c7e6509d471804a1b18eb65ce3b42d48e34d0e28
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 10 10:08:33 2014 +0000
coverity#1130454 Uncaught exception
Change-Id: Iec9368acec5c2ce529da54fcc6656f6d071bc337
diff --git a/vcl/qa/cppunit/canvasbitmaptest.cxx b/vcl/qa/cppunit/canvasbitmaptest.cxx
index 3be20d8..ccae63c 100644
--- a/vcl/qa/cppunit/canvasbitmaptest.cxx
+++ b/vcl/qa/cppunit/canvasbitmaptest.cxx
@@ -419,7 +419,9 @@ private:
}
virtual uno::Sequence< double > SAL_CALL convertColorSpace( const uno::Sequence< double >&,
- const uno::Reference< rendering::XColorSpace >& ) throw (uno::RuntimeException)
+ const uno::Reference< rendering::XColorSpace >& )
+ throw (uno::RuntimeException,
+ std::exception)
{
CPPUNIT_ASSERT_MESSAGE("convertColorSpace: method not implemented", false);
return uno::Sequence< double >();
commit 7d93cc4484dbf0eec02a6728ebd1f62edbd20ae1
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 10 10:06:32 2014 +0000
coverity#1130464 Uncaught exception
Change-Id: I14bd6e627e3a34c46fdbaee36714f8fff6f4033f
diff --git a/vcl/qa/cppunit/canvasbitmaptest.cxx b/vcl/qa/cppunit/canvasbitmaptest.cxx
index a9a5172..3be20d8 100644
--- a/vcl/qa/cppunit/canvasbitmaptest.cxx
+++ b/vcl/qa/cppunit/canvasbitmaptest.cxx
@@ -349,8 +349,10 @@ private:
}
virtual ::sal_Bool SAL_CALL getIndex( uno::Sequence< double >& entry,
- ::sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException,
- uno::RuntimeException)
+ ::sal_Int32 nIndex )
+ throw (lang::IndexOutOfBoundsException,
+ uno::RuntimeException,
+ std::exception)
{
CPPUNIT_ASSERT_MESSAGE( "Got palette getIndex interface call without handing out palette",
getPalette().is() );
commit d0492482b41dcab52769b9b4c33a94cba6ab09b7
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 10 10:05:51 2014 +0000
coverity#1130465 Uncaught exception
Change-Id: I67db69e52ac1dc5c1df5cda779be1a847838cce6
diff --git a/vcl/qa/cppunit/canvasbitmaptest.cxx b/vcl/qa/cppunit/canvasbitmaptest.cxx
index 16492d0..a9a5172 100644
--- a/vcl/qa/cppunit/canvasbitmaptest.cxx
+++ b/vcl/qa/cppunit/canvasbitmaptest.cxx
@@ -306,8 +306,11 @@ private:
}
virtual uno::Sequence< ::sal_Int8 > SAL_CALL getPixel( rendering::IntegerBitmapLayout&,
- const geometry::IntegerPoint2D& ) throw (lang::IndexOutOfBoundsException,
- rendering::VolatileContentDestroyedException, uno::RuntimeException)
+ const geometry::IntegerPoint2D& )
+ throw (lang::IndexOutOfBoundsException,
+ rendering::VolatileContentDestroyedException,
+ uno::RuntimeException,
+ std::exception)
{
CPPUNIT_ASSERT_MESSAGE("getPixel: method not implemented", false);
return uno::Sequence< sal_Int8 >();
commit 14b055d92cfea3515f15634d8f8a1ff8a6f7c0fd
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 10 10:04:46 2014 +0000
coverity#1130466 Uncaught exception
Change-Id: If6a62137cd5333475dfb15a992aa4026cb4b2aae
diff --git a/sc/inc/notesuno.hxx b/sc/inc/notesuno.hxx
index d482376..6fddccf 100644
--- a/sc/inc/notesuno.hxx
+++ b/sc/inc/notesuno.hxx
@@ -90,7 +90,9 @@ public:
virtual OUString SAL_CALL getAuthor()
throw(::com::sun::star::uno::RuntimeException,
std::exception);
- virtual OUString SAL_CALL getDate() throw(::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getDate()
+ throw(::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual sal_Bool SAL_CALL getIsVisible()
throw(::com::sun::star::uno::RuntimeException,
std::exception);
diff --git a/sc/source/ui/unoobj/notesuno.cxx b/sc/source/ui/unoobj/notesuno.cxx
index 665105c..1ef6616 100644
--- a/sc/source/ui/unoobj/notesuno.cxx
+++ b/sc/source/ui/unoobj/notesuno.cxx
@@ -204,7 +204,8 @@ OUString SAL_CALL ScAnnotationObj::getAuthor()
return pNote ? pNote->GetAuthor() : OUString();
}
-OUString SAL_CALL ScAnnotationObj::getDate() throw(uno::RuntimeException)
+OUString SAL_CALL ScAnnotationObj::getDate()
+ throw(uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
const ScPostIt* pNote = ImplGetNote();
commit 60f629882f6e90d086e55306028b9d6a5324b476
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 10 09:56:15 2014 +0000
coverity#1130467 Uncaught exception
Change-Id: Idc4020921086bd2e5d51acf73294150eb158fd06
diff --git a/sc/inc/notesuno.hxx b/sc/inc/notesuno.hxx
index db2fbe4..d482376 100644
--- a/sc/inc/notesuno.hxx
+++ b/sc/inc/notesuno.hxx
@@ -87,7 +87,9 @@ public:
/// XSheetAnnotation
virtual ::com::sun::star::table::CellAddress SAL_CALL getPosition()
throw(::com::sun::star::uno::RuntimeException);
- virtual OUString SAL_CALL getAuthor() throw(::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getAuthor()
+ throw(::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual OUString SAL_CALL getDate() throw(::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL getIsVisible()
throw(::com::sun::star::uno::RuntimeException,
diff --git a/sc/source/ui/unoobj/notesuno.cxx b/sc/source/ui/unoobj/notesuno.cxx
index 0d77c38..665105c 100644
--- a/sc/source/ui/unoobj/notesuno.cxx
+++ b/sc/source/ui/unoobj/notesuno.cxx
@@ -196,7 +196,8 @@ table::CellAddress SAL_CALL ScAnnotationObj::getPosition() throw(uno::RuntimeExc
return aAdr;
}
-OUString SAL_CALL ScAnnotationObj::getAuthor() throw(uno::RuntimeException)
+OUString SAL_CALL ScAnnotationObj::getAuthor()
+ throw(uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
const ScPostIt* pNote = ImplGetNote();
commit 2b12a5b87b1de9ae95d9562ba21201890b1100c5
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 10 09:29:34 2014 +0000
the return of callcatcher
Change-Id: I447ebcc61ff061bce15678c6fcfd3d0a4669908f
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx
index ba0f2b7..b3c3fc6 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx
@@ -208,7 +208,6 @@ private:
*/
void clearItems();
- void adjustEntriesIndexInParent(ListItems::iterator& _aBegin,::std::mem_fun_t<bool,VCLXAccessibleListItem>& _rMemFun);
void UpdateEntryRange_Impl (void);
protected:
void UpdateSelection_Impl (sal_uInt16 nPos = 0);
diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx
index debef70..44fb488 100644
--- a/accessibility/source/standard/vclxaccessiblelist.cxx
+++ b/accessibility/source/standard/vclxaccessiblelist.cxx
@@ -505,21 +505,7 @@ void VCLXAccessibleList::UpdateSelection (OUString sTextOfSelectedItem)
}
}
}
-// -----------------------------------------------------------------------------
-void VCLXAccessibleList::adjustEntriesIndexInParent(ListItems::iterator& _aBegin,::std::mem_fun_t<bool,VCLXAccessibleListItem>& _rMemFun)
-{
- ListItems::iterator aIter = _aBegin;
- ListItems::iterator aEnd = m_aAccessibleChildren.end();
- // adjust the index inside the VCLXAccessibleListItem
- for (;aIter != aEnd ; ++aIter)
- {
- Reference< XAccessible > xHold = *aIter;
- VCLXAccessibleListItem* pItem = static_cast<VCLXAccessibleListItem*>(xHold.get());
- if ( pItem )
- _rMemFun(pItem);
- }
-}
// -----------------------------------------------------------------------------
Reference<XAccessible> VCLXAccessibleList::CreateChild (sal_Int32 i)
diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx
index 793e873..f8f3a14 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -52,11 +52,6 @@ using namespace ::com::sun::star::resource;
// ==============
//
-ExtTreeListBox::ExtTreeListBox(Window* pParent, ResId const& rRes)
- : TreeListBox(pParent, rRes)
-{
-}
-
ExtTreeListBox::ExtTreeListBox(Window* pParent, WinBits nStyle)
: TreeListBox(pParent, nStyle)
{
diff --git a/basctl/source/basicide/moduldlg.hxx b/basctl/source/basicide/moduldlg.hxx
index e755b74..ee85969 100644
--- a/basctl/source/basicide/moduldlg.hxx
+++ b/basctl/source/basicide/moduldlg.hxx
@@ -111,7 +111,6 @@ protected:
SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos, sal_Bool bMove );
public:
- ExtTreeListBox(Window* pParent, const ResId& rRes);
ExtTreeListBox(Window* pParent, WinBits nStyle);
~ExtTreeListBox();
};
diff --git a/chart2/Library_chartcontroller.mk b/chart2/Library_chartcontroller.mk
index bf59cab..6a4907f 100644
--- a/chart2/Library_chartcontroller.mk
+++ b/chart2/Library_chartcontroller.mk
@@ -108,7 +108,6 @@ $(eval $(call gb_Library_add_exception_objects,chartcontroller,\
chart2/source/controller/dialogs/dlg_ShapeParagraph \
chart2/source/controller/dialogs/dlg_View3D \
chart2/source/controller/dialogs/ObjectNameProvider \
- chart2/source/controller/dialogs/RangeSelectionButton \
chart2/source/controller/dialogs/RangeSelectionHelper \
chart2/source/controller/dialogs/RangeSelectionListener \
chart2/source/controller/dialogs/res_BarGeometry \
diff --git a/chart2/source/controller/dialogs/Bitmaps.hrc b/chart2/source/controller/dialogs/Bitmaps.hrc
index bcf1f37..349953b 100644
--- a/chart2/source/controller/dialogs/Bitmaps.hrc
+++ b/chart2/source/controller/dialogs/Bitmaps.hrc
@@ -218,9 +218,6 @@
#define BMP_REGRESSION_POLYNOMIAL (RID_APP_START + 110)
#define BMP_REGRESSION_MOVING_AVERAGE (RID_APP_START + 111)
-// hide-button for range-choosing
-#define IMG_SELECTRANGE (RID_APP_START + 100)
-
// CHART_BITMAPS_HRC
#endif
diff --git a/chart2/source/controller/dialogs/Bitmaps.src b/chart2/source/controller/dialogs/Bitmaps.src
index 9ee6381..d4f7809 100644
--- a/chart2/source/controller/dialogs/Bitmaps.src
+++ b/chart2/source/controller/dialogs/Bitmaps.src
@@ -595,14 +595,5 @@ Image BMP_REGRESSION_MOVING_AVERAGE
File = "regavg.png" ;
};
};
-//---------------------
-Image IMG_SELECTRANGE
-{
- ImageBitmap = Bitmap
- {
- File = "selectrange.png";
- };
- MaskColor = STD_MASKCOLOR;
-};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/RangeSelectionButton.cxx b/chart2/source/controller/dialogs/RangeSelectionButton.cxx
deleted file mode 100644
index 2b14e8e..0000000
--- a/chart2/source/controller/dialogs/RangeSelectionButton.cxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "RangeSelectionButton.hxx"
-#include "Bitmaps.hrc"
-#include "Strings.hrc"
-#include "ResId.hxx"
-
-namespace chart
-{
-
-RangeSelectionButton::RangeSelectionButton( Window *pParent, const ResId& rResId ) :
- ImageButton( pParent, rResId )
-{
- SetModeImage( Image( SchResId( IMG_SELECTRANGE) ) );
- this->SetQuickHelpText(SCH_RESSTR(STR_TIP_SELECT_RANGE));
-}
-
-RangeSelectionButton::~RangeSelectionButton()
-{
-}
-
-} //namespace chart
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/Strings.src b/chart2/source/controller/dialogs/Strings.src
index f03ce30..371e2e9 100644
--- a/chart2/source/controller/dialogs/Strings.src
+++ b/chart2/source/controller/dialogs/Strings.src
@@ -373,16 +373,6 @@ String STR_OBJECT_SHAPE
Text [ en-US ] = "Drawing Object" ;
};
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-
-String STR_TIP_SELECT_RANGE
-{
- Text [ en-US ] = "Select data range" ;
-};
-
String STR_TIP_DATASERIES
{
Text [ en-US ] = "Data Series '%SERIESNAME'" ;
diff --git a/chart2/source/controller/dialogs/TextDirectionListBox.cxx b/chart2/source/controller/dialogs/TextDirectionListBox.cxx
index 25efde3..46149a6 100644
--- a/chart2/source/controller/dialogs/TextDirectionListBox.cxx
+++ b/chart2/source/controller/dialogs/TextDirectionListBox.cxx
@@ -27,21 +27,6 @@
namespace chart
{
-TextDirectionListBox::TextDirectionListBox( Window* pParent, const ResId& rResId, Window* pWindow1, Window* pWindow2 ) :
- svx::FrameDirectionListBox( pParent, rResId )
-{
- InsertEntryValue( SCH_RESSTR( STR_TEXT_DIRECTION_LTR ), FRMDIR_HORI_LEFT_TOP );
- InsertEntryValue( SCH_RESSTR( STR_TEXT_DIRECTION_RTL ), FRMDIR_HORI_RIGHT_TOP );
- InsertEntryValue( SCH_RESSTR( STR_TEXT_DIRECTION_SUPER ), FRMDIR_ENVIRONMENT );
-
- if( !SvtLanguageOptions().IsCTLFontEnabled() )
- {
- Hide();
- if( pWindow1 ) pWindow1->Hide();
- if( pWindow2 ) pWindow2->Hide();
- }
-}
-
TextDirectionListBox::TextDirectionListBox( Window* pParent, Window* pWindow1, Window* pWindow2 ) :
svx::FrameDirectionListBox( pParent, WB_BORDER | WB_TABSTOP | WB_DROPDOWN)
{
diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx
index fce3938..b5a8650 100644
--- a/chart2/source/controller/dialogs/res_ErrorBar.cxx
+++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx
@@ -430,7 +430,7 @@ IMPL_LINK_NOARG(ErrorBarResources, IndicatorChanged)
return 0;
}
-IMPL_LINK( ErrorBarResources, ChooseRange, RangeSelectionButton *, pButton )
+IMPL_LINK( ErrorBarResources, ChooseRange, PushButton*, pButton )
{
OSL_ASSERT( m_apRangeSelectionHelper.get());
if( ! m_apRangeSelectionHelper.get())
diff --git a/chart2/source/controller/dialogs/res_LegendPosition.cxx b/chart2/source/controller/dialogs/res_LegendPosition.cxx
index f50a885..fb05a6a 100644
--- a/chart2/source/controller/dialogs/res_LegendPosition.cxx
+++ b/chart2/source/controller/dialogs/res_LegendPosition.cxx
@@ -242,14 +242,6 @@ void LegendPositionResources::SetChangeHdl( const Link& rLink )
m_aChangeLink = rLink;
}
-void LegendPositionResources::SetAccessibleRelationMemberOf(Window* pMemberOf)
-{
- m_pRbtLeft->SetAccessibleRelationMemberOf(pMemberOf);
- m_pRbtRight->SetAccessibleRelationMemberOf(pMemberOf);
- m_pRbtTop->SetAccessibleRelationMemberOf(pMemberOf);
- m_pRbtBottom->SetAccessibleRelationMemberOf(pMemberOf);
-}
-
} //namespace chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.hxx b/chart2/source/controller/dialogs/tp_RangeChooser.hxx
index 9f3e538..3c6bf37 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.hxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_TP_RANGECHOOSER_HXX
#include "RangeSelectionListener.hxx"
-#include "RangeSelectionButton.hxx"
#include "TabPageNotifiable.hxx"
#include <com/sun/star/chart2/XChartDocument.hpp>
diff --git a/chart2/source/controller/inc/RangeSelectionButton.hxx b/chart2/source/controller/inc/RangeSelectionButton.hxx
deleted file mode 100644
index b2fe9ac..0000000
--- a/chart2/source/controller/inc/RangeSelectionButton.hxx
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_INC_RANGESELECTIONBUTTON_HXX
-#define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_RANGESELECTIONBUTTON_HXX
-
-// header for Class ImageButton
-#include <vcl/button.hxx>
-
-namespace chart
-{
-
-/**
-*/
-
-class RangeSelectionButton : public ImageButton
-{
-public:
- RangeSelectionButton( Window* pParent, const ResId& rResId );
- virtual ~RangeSelectionButton();
-};
-
-} //namespace chart
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/inc/TextDirectionListBox.hxx b/chart2/source/controller/inc/TextDirectionListBox.hxx
index 80a4aae..40144e3 100644
--- a/chart2/source/controller/inc/TextDirectionListBox.hxx
+++ b/chart2/source/controller/inc/TextDirectionListBox.hxx
@@ -30,8 +30,6 @@ namespace chart
class TextDirectionListBox : public svx::FrameDirectionListBox
{
public:
- explicit TextDirectionListBox( Window* pParent, const ResId& rResId,
- Window* pWindow1 = 0, Window* pWindow2 = 0 );
explicit TextDirectionListBox( Window* pParent,
Window* pWindow1 = 0, Window* pWindow2 = 0 );
virtual ~TextDirectionListBox();
diff --git a/chart2/source/controller/inc/res_ErrorBar.hxx b/chart2/source/controller/inc/res_ErrorBar.hxx
index 17b7e3b..0825e45a 100644
--- a/chart2/source/controller/inc/res_ErrorBar.hxx
+++ b/chart2/source/controller/inc/res_ErrorBar.hxx
@@ -27,7 +27,6 @@
#include <svl/itemset.hxx>
#include <svx/chrtitem.hxx>
#include "chartview/ChartSfxItemIds.hxx"
-#include "RangeSelectionButton.hxx"
#include "RangeSelectionListener.hxx"
@@ -128,7 +127,7 @@ private:
DECL_LINK( SynchronizePosAndNeg, void * );
DECL_LINK( PosValueChanged, void * );
DECL_LINK( IndicatorChanged, void * );
- DECL_LINK( ChooseRange, RangeSelectionButton * );
+ DECL_LINK( ChooseRange, PushButton * );
DECL_LINK( RangeChanged, Edit * );
void UpdateControlStates();
diff --git a/chart2/source/controller/inc/res_LegendPosition.hxx b/chart2/source/controller/inc/res_LegendPosition.hxx
index f1989c6..3a739ce 100644
--- a/chart2/source/controller/inc/res_LegendPosition.hxx
+++ b/chart2/source/controller/inc/res_LegendPosition.hxx
@@ -53,8 +53,6 @@ public:
DECL_LINK( PositionEnableHdl, void* );
DECL_LINK( PositionChangeHdl, RadioButton* );
- void SetAccessibleRelationMemberOf(Window* pMemberOf);
-
private:
void impl_setRadioButtonToggleHdl();
diff --git a/chart2/source/inc/Strings.hrc b/chart2/source/inc/Strings.hrc
index c0e1435..9fcdf13 100644
--- a/chart2/source/inc/Strings.hrc
+++ b/chart2/source/inc/Strings.hrc
@@ -70,7 +70,6 @@
#define STR_BAR_GEOMETRY (RID_APP_START + 127)
#define STR_NUMBER_OF_LINES (RID_APP_START + 128)
-#define STR_TIP_SELECT_RANGE (RID_APP_START + 196)
#define STR_3DSCHEME_SIMPLE (RID_APP_START + 231)
#define STR_3DSCHEME_REALISTIC (RID_APP_START + 232)
diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx
index 33041fd..c90effc 100644
--- a/include/sfx2/basedlgs.hxx
+++ b/include/sfx2/basedlgs.hxx
@@ -70,7 +70,6 @@ private:
protected:
SfxModalDialog(Window *pParent, const ResId& );
SfxModalDialog(Window *pParent, const OString& rID, const OUString& rUIXMLDescription);
- SfxModalDialog(Window* pParent, sal_uInt32 nUniqueId, WinBits nWinStyle = WB_STDMODAL );
OUString& GetExtraData() { return aExtraData; }
sal_uInt32 GetUniqId() const { return nUniqId; }
diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index 99b04f8..a34c06d 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
@@ -135,10 +135,6 @@ public:
SfxTabDialog( SfxViewFrame *pViewFrame, Window* pParent,
const OString& rID, const OUString& rUIXMLDescription,
const SfxItemSet * = 0, sal_Bool bEditFmt = sal_False );
-
-
- SfxTabDialog( Window* pParent, const ResId &rResId, const SfxItemSet * = 0,
- sal_Bool bEditFmt = sal_False, const OUString *pUserButtonText = 0 );
~SfxTabDialog();
sal_uInt16 AddTabPage( const OString& rName, // Name of the label for the page in the notebook .ui
@@ -169,8 +165,6 @@ public:
sal_uInt16 nPos = TAB_APPEND);
void AddTabPage( sal_uInt16 nId,
- sal_Bool bItemsOnDemand = sal_False);
- void AddTabPage( sal_uInt16 nId,
const OUString &rRiderText,
sal_Bool bItemsOnDemand = sal_False,
sal_uInt16 nPos = TAB_APPEND);
diff --git a/include/sfx2/templatelocalview.hxx b/include/sfx2/templatelocalview.hxx
index 5e065e77..6234c29 100644
--- a/include/sfx2/templatelocalview.hxx
+++ b/include/sfx2/templatelocalview.hxx
@@ -29,7 +29,6 @@ class SFX2_DLLPUBLIC TemplateLocalView : public TemplateAbstractView
public:
- TemplateLocalView ( Window* pParent, const ResId& rResId, bool bDisableTransientChildren = false );
TemplateLocalView ( Window* pParent );
virtual ~TemplateLocalView ();
diff --git a/include/svtools/accessibleruler.hxx b/include/svtools/accessibleruler.hxx
index 0f98981..c792466 100644
--- a/include/svtools/accessibleruler.hxx
+++ b/include/svtools/accessibleruler.hxx
@@ -179,16 +179,6 @@ public:
virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL
getImplementationId( void ) throw( ::com::sun::star::uno::RuntimeException );
-
-
-
-public:
-
- /// Sets the name
- void setName( const ::rtl::OUString& rName );
-
- /// Sets the description
- void setDescription( const ::rtl::OUString& rDescr );
private:
static ::com::sun::star::uno::Sequence< sal_Int8 > getUniqueId( void );
protected:
diff --git a/include/svtools/fmtfield.hxx b/include/svtools/fmtfield.hxx
index e70f147..aa7d36a 100644
--- a/include/svtools/fmtfield.hxx
+++ b/include/svtools/fmtfield.hxx
@@ -95,7 +95,6 @@ protected:
public:
FormattedField(Window* pParent, WinBits nStyle = 0, SvNumberFormatter* pInitialFormatter = NULL, sal_Int32 nFormatKey = 0);
- FormattedField(Window* pParent, const ResId& rResId, SvNumberFormatter* pInitialFormatter = NULL, sal_Int32 nFormatKey = 0);
virtual ~FormattedField();
// Min-/Max-Verwaltung
@@ -274,12 +273,6 @@ public:
ResetConformanceTester();
}
- DoubleNumericField(Window* pParent, const ResId& rResId)
- :FormattedField(pParent, rResId)
- ,m_pNumberValidator( NULL )
- {
- ResetConformanceTester();
- }
virtual ~DoubleNumericField();
protected:
diff --git a/include/svtools/svtabbx.hxx b/include/svtools/svtabbx.hxx
index 3424856..8e29e30 100644
--- a/include/svtools/svtabbx.hxx
+++ b/include/svtools/svtabbx.hxx
@@ -140,7 +140,6 @@ private:
public:
SvHeaderTabListBox( Window* pParent, WinBits nBits );
- SvHeaderTabListBox( Window* pParent, const ResId& );
~SvHeaderTabListBox();
virtual void Paint( const Rectangle& );
diff --git a/include/svx/dialcontrol.hxx b/include/svx/dialcontrol.hxx
index 06fecd1..b8ea315 100644
--- a/include/svx/dialcontrol.hxx
+++ b/include/svx/dialcontrol.hxx
@@ -80,7 +80,6 @@ private:
class SVX_DLLPUBLIC DialControl : public Control
{
public:
- explicit DialControl( Window* pParent, const ResId& rResId );
explicit DialControl( Window* pParent, WinBits nBits );
virtual ~DialControl();
diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx
index 882da38..6d18ea46 100644
--- a/include/svx/dlgctrl.hxx
+++ b/include/svx/dlgctrl.hxx
@@ -99,8 +99,6 @@ protected:
Point GetApproxLogPtFromPixPt( const Point& rRoughPixelPoint ) const;
public:
- SvxRectCtl( Window* pParent, const ResId& rResId, RECT_POINT eRpt = RP_MM,
- sal_uInt16 nBorder = 200, sal_uInt16 nCircle = 80, CTL_STYLE eStyle = CS_RECT );
SvxRectCtl( Window* pParent, RECT_POINT eRpt = RP_MM,
sal_uInt16 nBorder = 200, sal_uInt16 nCircle = 80, CTL_STYLE eStyle = CS_RECT );
void SetControlSettings(RECT_POINT eRpt = RP_MM, sal_uInt16 nBorder = 200,
diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx
index 64ae54f..f978e7b 100644
--- a/include/svx/langbox.hxx
+++ b/include/svx/langbox.hxx
@@ -68,7 +68,6 @@ private:
SVX_DLLPRIVATE sal_uInt16 ImplInsertLanguage(LanguageType, sal_uInt16, sal_Int16 );
public:
- SvxLanguageBox(Window* pParent, const ResId& rResId, sal_Bool bCheck = sal_False);
SvxLanguageBox(Window* pParent, WinBits nBits, sal_Bool bCheck = sal_False);
~SvxLanguageBox();
diff --git a/include/svx/txencbox.hxx b/include/svx/txencbox.hxx
index c21f990..df5778a 100644
--- a/include/svx/txencbox.hxx
+++ b/include/svx/txencbox.hxx
@@ -33,9 +33,8 @@ private:
SVX_DLLPRIVATE sal_uInt16 EncodingToPos_Impl( rtl_TextEncoding nEnc ) const;
public:
- SvxTextEncodingBox( Window* pParent, const ResId& rResId );
- SvxTextEncodingBox( Window* pParent, WinBits nBits );
- ~SvxTextEncodingBox();
+ SvxTextEncodingBox( Window* pParent, WinBits nBits );
+ ~SvxTextEncodingBox();
/** Fill with all known encodings but exclude those matching one or more
given flags as defined in rtl/tencinfo.h
diff --git a/include/svx/wrapfield.hxx b/include/svx/wrapfield.hxx
index 0f403a1..073d208 100644
--- a/include/svx/wrapfield.hxx
+++ b/include/svx/wrapfield.hxx
@@ -32,7 +32,6 @@ namespace svx {
class SVX_DLLPUBLIC WrapField : public NumericField
{
public:
- explicit WrapField( Window* pParent, const ResId& rResId );
explicit WrapField( Window* pParent, WinBits nBits );
protected:
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 397ca22..32d71da 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -389,7 +389,6 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
sc/source/ui/dbgui/csvsplits \
sc/source/ui/dbgui/csvtablebox \
sc/source/ui/dbgui/dbnamdlg \
- sc/source/ui/dbgui/expftext \
$(if $(filter TRUE,$(MPL_SUBSET)),, \
sc/source/ui/dbgui/fieldwnd) \
sc/source/ui/dbgui/filtdlg \
diff --git a/sc/source/ui/dbgui/expftext.cxx b/sc/source/ui/dbgui/expftext.cxx
deleted file mode 100644
index 95017bf..0000000
--- a/sc/source/ui/dbgui/expftext.cxx
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "expftext.hxx"
-#include <vcl/help.hxx>
-
-/*************************************************************************
-#* Member: ScExpandedFixedText
-#*------------------------------------------------------------------------
-#*
-#* Klasse: MD_Test
-#*
-#* Funktion: Konstruktor der Klasse SvxCtrDial
-#*
-#* Input: Parent- Window, Resource ID
-#*
-#* Output: ---
-#*
-#************************************************************************/
-
-ScExpandedFixedText::ScExpandedFixedText( Window* pParent,
- const ResId& rResId) :
- FixedText( pParent, rResId )
-{
-
-}
-
-/*************************************************************************
-#* Member: RequestHelp
-#*------------------------------------------------------------------------
-#*
-#* Klasse: ScExpandedFixedText
-#*
-#* Funktion: Die Methode wird gerufen, um Hilfe fuer das Fenster
-#* anzuzeigen. Zeigt das Fenster einen gekuerzten Text
-#* an, so wird selbiger in voller Laenge angezeigt.
-#*
-#* Input: HelpEvent
-#*
-#* Output: ---
-#*
-#************************************************************************/
-
-void ScExpandedFixedText::RequestHelp(const HelpEvent& rEvt)
-{
- OUString aTxtStr = GetText();
- long nTxtWidth = GetTextWidth(aTxtStr);
- if ( ( rEvt.GetMode() & HELPMODE_QUICK ) == HELPMODE_QUICK &&
- nTxtWidth > GetSizePixel().Width())
- {
- Point aShowPoint = OutputToScreenPixel(Point(0,0));
- long nTxtHeight = GetTextHeight();
-
- Help::ShowQuickHelp( this,
- Rectangle( aShowPoint, Size(nTxtWidth,nTxtHeight) ), aTxtStr,
- QUICKHELP_TOP|QUICKHELP_LEFT );
- }
- else
- {
- FixedText::RequestHelp( rEvt );
- }
-}
-
-
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/dbnamdlg.hxx b/sc/source/ui/inc/dbnamdlg.hxx
index 2fccd0e..7ea6ad6 100644
--- a/sc/source/ui/inc/dbnamdlg.hxx
+++ b/sc/source/ui/inc/dbnamdlg.hxx
@@ -28,7 +28,6 @@
#include "anyrefdg.hxx"
#include "dbdata.hxx"
-#include "expftext.hxx"
class ScViewData;
class ScDocument;
diff --git a/sc/source/ui/inc/expftext.hxx b/sc/source/ui/inc/expftext.hxx
deleted file mode 100644
index 09ba390..0000000
--- a/sc/source/ui/inc/expftext.hxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef _SC_EXPFTEXT_HXX
-#define _SC_EXPFTEXT_HXX
-
-#include <vcl/fixed.hxx>
-#include "scdllapi.h"
-
-class SC_DLLPUBLIC ScExpandedFixedText: public FixedText
-{
- protected:
-
- void RequestHelp( const HelpEvent& rHEvt );
-
- public:
- ScExpandedFixedText( Window* pWindow, const ResId& rResId);
-};
-
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/instbdlg.hxx b/sc/source/ui/inc/instbdlg.hxx
index fd74a90..754b03b 100644
--- a/sc/source/ui/inc/instbdlg.hxx
+++ b/sc/source/ui/inc/instbdlg.hxx
@@ -31,7 +31,6 @@
#include <sfx2/objsh.hxx>
#include <vcl/field.hxx>
-#include "expftext.hxx"
class ScViewData;
class ScDocument;
diff --git a/sc/source/ui/inc/simpref.hxx b/sc/source/ui/inc/simpref.hxx
index 71ff5bc..c61d1d2 100644
--- a/sc/source/ui/inc/simpref.hxx
+++ b/sc/source/ui/inc/simpref.hxx
@@ -29,7 +29,6 @@
#include <vcl/morebtn.hxx>
#include "anyrefdg.hxx"
#include "dbdata.hxx"
-#include "expftext.hxx"
class ScViewData;
class ScDocument;
diff --git a/sc/source/ui/inc/xmlsourcedlg.hxx b/sc/source/ui/inc/xmlsourcedlg.hxx
index 8669405..e71b9df 100644
--- a/sc/source/ui/inc/xmlsourcedlg.hxx
+++ b/sc/source/ui/inc/xmlsourcedlg.hxx
@@ -15,7 +15,6 @@
#include <vcl/layout.hxx>
#include "svtools/treelistbox.hxx"
-#include "expftext.hxx"
#include "anyrefdg.hxx"
#include "orcusxml.hxx"
diff --git a/sc/source/ui/sidebar/CellLineStyleValueSet.cxx b/sc/source/ui/sidebar/CellLineStyleValueSet.cxx
index fbc1ff7..6cfbd0c 100644
--- a/sc/source/ui/sidebar/CellLineStyleValueSet.cxx
+++ b/sc/source/ui/sidebar/CellLineStyleValueSet.cxx
@@ -59,11 +59,6 @@ void CellLineStyleValueSet::SetSelItem(sal_uInt16 nSel)
}
}
-void CellLineStyleValueSet::SetImage(Image img)
-{
- imgCus = img;
-}
-
void CellLineStyleValueSet::UserDraw( const UserDrawEvent& rUDEvt )
{
Rectangle aRect = rUDEvt.GetRect();
diff --git a/sc/source/ui/sidebar/CellLineStyleValueSet.hxx b/sc/source/ui/sidebar/CellLineStyleValueSet.hxx
index 1f6ff5e..971688c 100644
--- a/sc/source/ui/sidebar/CellLineStyleValueSet.hxx
+++ b/sc/source/ui/sidebar/CellLineStyleValueSet.hxx
@@ -32,14 +32,12 @@ private:
VirtualDevice* pVDev;
sal_uInt16 nSelItem;
OUString maStrUnit[CELL_LINE_STYLE_ENTRIES];
- Image imgCus;
public:
CellLineStyleValueSet( Window* pParent, const ResId& rResId);
virtual ~CellLineStyleValueSet();
void SetUnit(const OUString* str);
void SetSelItem(sal_uInt16 nSel);
- void SetImage(Image img);
virtual void UserDraw( const UserDrawEvent& rUDEvt );
};
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx
index 62289b7..1733a10 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -251,48 +251,6 @@ AutoLayout LayoutMenu::GetSelectedAutoLayout (void)
return aResult;
}
-
-
-
-/** The preferred size depends on the preferred number of columns, the
- number of items, and the size of the items.
-*/
-Size LayoutMenu::GetPreferredSize (void)
-{
- Size aItemSize = CalcItemSizePixel (Size());
- Size aPreferredWindowSize = CalcWindowSizePixel (
- aItemSize,
- (sal_uInt16)mnPreferredColumnCount,
- (sal_uInt16)CalculateRowCount (aItemSize,mnPreferredColumnCount));
- return aPreferredWindowSize;
-}
-
-
-
-
-sal_Int32 LayoutMenu::GetPreferredWidth (sal_Int32 nHeight)
-{
- sal_Int32 nPreferredWidth = 100;
- if (GetItemCount() > 0)
- {
- Image aImage = GetItemImage(GetItemId(0));
- Size aItemSize = CalcItemSizePixel (aImage.GetSizePixel());
- if (nHeight>0 && aItemSize.Height()>0)
- {
- int nRowCount = nHeight / aItemSize.Height();
- if (nRowCount <= 0)
- nRowCount = 1;
- int nColumnCount = (GetItemCount() + nRowCount-1) / nRowCount;
- nPreferredWidth = nColumnCount * aItemSize.Width();
- }
- }
-
- return nPreferredWidth;
-}
-
-
-
-
ui::LayoutSize LayoutMenu::GetHeightForWidth (const sal_Int32 nWidth)
{
sal_Int32 nPreferredHeight = 200;
@@ -319,21 +277,6 @@ ui::LayoutSize LayoutMenu::GetHeightForWidth (const sal_Int32 nWidth)
-sal_Int32 LayoutMenu::GetMinimumWidth (void)
-{
- sal_Int32 nMinimumWidth = 0;
- if (GetItemCount()>0)
- {
- Image aImage = GetItemImage(GetItemId(0));
- Size aItemSize = CalcItemSizePixel (aImage.GetSizePixel());
- nMinimumWidth = aItemSize.Width();
- }
- return nMinimumWidth;
-}
-
-
-
-
void LayoutMenu::Paint (const Rectangle& rRect)
{
if (mbSelectionUpdatePending)
diff --git a/sd/source/ui/sidebar/LayoutMenu.hxx b/sd/source/ui/sidebar/LayoutMenu.hxx
index a858101..88cfa52 100644
--- a/sd/source/ui/sidebar/LayoutMenu.hxx
+++ b/sd/source/ui/sidebar/LayoutMenu.hxx
@@ -85,10 +85,6 @@ public:
*/
AutoLayout GetSelectedAutoLayout (void);
- Size GetPreferredSize (void);
- sal_Int32 GetPreferredWidth (sal_Int32 nHeight);
- sal_Int32 GetMinimumWidth (void);
-
// From ILayoutableWindow
virtual css::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth);
diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx
index 35890f7..9a916e9 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -32,12 +32,6 @@ using namespace ::com::sun::star::frame;
static void lcl_updateThumbnails (TemplateContainerItem *pItem);
-TemplateLocalView::TemplateLocalView ( Window* pParent, const ResId& rResId, bool bDisableTransientChildren)
- : TemplateAbstractView(pParent,rResId,bDisableTransientChildren),
- mpDocTemplates(new SfxDocumentTemplates)
-{
-}
-
TemplateLocalView::TemplateLocalView ( Window* pParent)
: TemplateAbstractView(pParent),
mpDocTemplates(new SfxDocumentTemplates)
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index eedd2d9..609f81a 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -164,26 +164,6 @@ SfxModalDialog::SfxModalDialog(Window *pParent, const OString& rID, const OUStri
// -----------------------------------------------------------------------
-SfxModalDialog::SfxModalDialog(Window* pParent,
- sal_uInt32 nUniqueId,
- WinBits nWinStyle) :
-/* [Description]
-
- Constructor of the general base class for modal Dialoge;
- The ID for the ini-file wird explicilty handed over.
- The saved position from there is set.
-*/
-
- ModalDialog(pParent, nWinStyle),
- nUniqId(nUniqueId),
- pInputSet(0),
- pOutputSet(0)
-{
- init();
-}
-
-// -----------------------------------------------------------------------
-
SfxModalDialog::~SfxModalDialog()
/* [Description]
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index f0ac157..d7e9052 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -388,16 +388,6 @@ SfxTabDialog* SfxTabPage::GetTabDialog() const
return dynamic_cast<SfxTabDialog*>(GetParentDialog());
}
-#define INI_LIST(ItemSetPtr) \
- pSet(ItemSetPtr) \
- , pOutSet(0) \
- , pRanges(0) \
- , nResId(rResId.GetId()) \
- , nAppPageId(USHRT_MAX) \
- , bItemsReset(sal_False) \
- , bFmt(bEditFmt)\
- , pExampleSet(0)
-
// -----------------------------------------------------------------------
SfxTabDialog::SfxTabDialog
@@ -435,31 +425,6 @@ SfxTabDialog::SfxTabDialog
(
Window* pParent, // Parent Window
- const ResId& rResId, // ResourceId
- const SfxItemSet* pItemSet, // Itemset with the data;
- // can be NULL, when Pages are onDemand
- sal_Bool bEditFmt, // Flag: templates are processed
- // when yes -> additional Button for standard
- const OUString* pUserButtonText // Text for UserButton;
- // if != 0, the UserButton is created
-)
- : TabDialog(pParent, rResId)
- , pFrame(0)
- , INI_LIST(pItemSet)
-{
- Init_Impl( bFmt, pUserButtonText, &rResId );
- DBG_WARNING( "Please use the Construtor with the ViewFrame" );
-}
-
-SfxTabDialog::SfxTabDialog
-
-/* [Description]
-
- Constructor, temporary without Frame
-*/
-
-(
- Window* pParent, // Parent Window
const OString& rID, const OUString& rUIXMLDescription, //Dialog Name, Dialog .ui path
const SfxItemSet* pItemSet, // Itemset with the data;
// can be NULL, when Pages are onDemand
@@ -747,11 +712,6 @@ void SfxTabDialog::Start_Impl()
ActivatePageHdl( m_pTabCtrl );
}
-void SfxTabDialog::AddTabPage( sal_uInt16 nId, sal_Bool bItemsOnDemand )
-{
- AddTabPage( nId, 0, 0, bItemsOnDemand );
-}
-
void SfxTabDialog::AddTabPage( sal_uInt16 nId, const OUString &rRiderText, sal_Bool bItemsOnDemand, sal_uInt16 nPos )
{
AddTabPage( nId, rRiderText, 0, 0, bItemsOnDemand, nPos );
diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx
index adb759c..feee0a4 100644
--- a/svtools/source/contnr/svtabbx.cxx
+++ b/svtools/source/contnr/svtabbx.cxx
@@ -528,18 +528,6 @@ SvHeaderTabListBox::SvHeaderTabListBox( Window* pParent, WinBits nWinStyle ) :
// -----------------------------------------------------------------------
-SvHeaderTabListBox::SvHeaderTabListBox( Window* pParent, const ResId& rResId ) :
-
- SvTabListBox( pParent, rResId ),
-
- m_bFirstPaint ( sal_True ),
- m_pImpl ( new ::svt::SvHeaderTabListBoxImpl ),
- m_pAccessible ( NULL )
-{
-}
-
-// -----------------------------------------------------------------------
-
SvHeaderTabListBox::~SvHeaderTabListBox()
{
delete m_pImpl;
diff --git a/svtools/source/control/accessibleruler.cxx b/svtools/source/control/accessibleruler.cxx
index 02e4f53..6a42ae7 100644
--- a/svtools/source/control/accessibleruler.cxx
+++ b/svtools/source/control/accessibleruler.cxx
@@ -385,22 +385,6 @@ Sequence< sal_Int8 > SAL_CALL SvtRulerAccessible::getImplementationId( void ) th
return getUniqueId();
}
-//===== internals ========================================================
-void SvtRulerAccessible::setName( const OUString& rName )
-{
- msName = rName;
-
-}
-
-void SvtRulerAccessible::setDescription( const OUString& rDescr )
-{
-
- msDescription = rDescr;
-
-}
-
-
-
void SAL_CALL SvtRulerAccessible::disposing()
{
if( !rBHelper.bDisposed )
diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx
index 95587f1..9f04b9f 100644
--- a/svtools/source/control/fmtfield.cxx
+++ b/svtools/source/control/fmtfield.cxx
@@ -332,18 +332,6 @@ FormattedField::FormattedField(Window* pParent, WinBits nStyle, SvNumberFormatte
}
}
-FormattedField::FormattedField(Window* pParent, const ResId& rResId, SvNumberFormatter* pInitialFormatter, sal_Int32 nFormatKey)
- :SpinField(pParent, rResId)
- ,INIT_MEMBERS()
-{
- DBG_CTOR(FormattedField, NULL);
-
- if (pInitialFormatter)
- {
- m_pFormatter = pInitialFormatter;
- m_nFormatKey = nFormatKey;
- }
-}
extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeFormattedField(Window *pParent, VclBuilder::stringmap &)
{
WinBits nWinBits = WB_BORDER;
diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx
index 69400e1..632a873 100644
--- a/svx/source/dialog/dialcontrol.cxx
+++ b/svx/source/dialog/dialcontrol.cxx
@@ -265,13 +265,6 @@ void DialControl::DialControl_Impl::SetSize( const Size& rWinSize )
// ============================================================================
-DialControl::DialControl( Window* pParent, const ResId& rResId ) :
- Control( pParent, rResId ),
- mpImpl( new DialControl_Impl( *this ) )
-{
- Init( GetOutputSizePixel() );
-}
-
DialControl::DialControl( Window* pParent, WinBits nBits ) :
Control( pParent, nBits ),
mpImpl( new DialControl_Impl( *this ) )
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index 11ecdca..78c7bb2 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -66,24 +66,6 @@ Bitmap& SvxRectCtl::GetRectBitmap( void )
return *pBitmap;
}
-SvxRectCtl::SvxRectCtl( Window* pParent, const ResId& rResId, RECT_POINT eRpt,
- sal_uInt16 nBorder, sal_uInt16 nCircle, CTL_STYLE eStyle ) :
-
- Control( pParent, rResId ),
-
- pAccContext ( NULL ),
- nBorderWidth( nBorder ),
- nRadius ( nCircle),
- eDefRP ( eRpt ),
- eCS ( eStyle ),
- pBitmap ( NULL ),
- m_nState ( 0 ),
- mbCompleteDisable(sal_False)
-{
- SetMapMode( MAP_100TH_MM );
- Resize_Impl();
-}
-
SvxRectCtl::SvxRectCtl(Window* pParent, RECT_POINT eRpt,
sal_uInt16 nBorder, sal_uInt16 nCircle, CTL_STYLE eStyle)
: Control(pParent, WB_BORDER | WB_TABSTOP)
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index 501a2fe..bd024f4 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -119,15 +119,6 @@ sal_uInt16 TypeToPos_Impl( LanguageType eType, const ListBox& rLb )
return nPos;
}
-//------------------------------------------------------------------------
-SvxLanguageBox::SvxLanguageBox( Window* pParent, const ResId& rResId, sal_Bool bCheck ) :
- ListBox( pParent, rResId ),
- m_pSpellUsedLang( NULL ),
- m_bWithCheckmark( bCheck )
-{
- Init();
-}
-
SvxLanguageBox::SvxLanguageBox( Window* pParent, WinBits nBits, sal_Bool bCheck )
: ListBox( pParent, nBits )
, m_pSpellUsedLang( NULL )
diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx
index 8571bdaf..33d7ee4 100644
--- a/svx/source/dialog/txencbox.cxx
+++ b/svx/source/dialog/txencbox.cxx
@@ -35,13 +35,6 @@
// class SvxTextEncodingBox
//========================================================================
-SvxTextEncodingBox::SvxTextEncodingBox( Window* pParent, const ResId& rResId )
- :
- ListBox( pParent, rResId )
-{
- m_pEncTable = new SvxTextEncodingTable;
-}
-
SvxTextEncodingBox::SvxTextEncodingBox( Window* pParent, WinBits nBits )
: ListBox( pParent, nBits )
{
diff --git a/svx/source/dialog/wrapfield.cxx b/svx/source/dialog/wrapfield.cxx
index 76302d8..4646499 100644
--- a/svx/source/dialog/wrapfield.cxx
+++ b/svx/source/dialog/wrapfield.cxx
@@ -22,11 +22,6 @@
namespace svx {
-WrapField::WrapField( Window* pParent, const ResId& rResId ) :
- NumericField( pParent, rResId )
-{
-}
-
WrapField::WrapField( Window* pParent, WinBits nBits ) :
NumericField( pParent, nBits )
{
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index 20dfcea..5f919cf 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -289,9 +289,6 @@ public:
virtual void setDocAccTitle( const OUString& rTitle );
virtual const OUString getDocAccTitle() const;
- void setDocReadOnly( bool bReadOnly);
- bool getDocReadOnly() const;
-
::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >
GetController();
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index 6935f43..561e396 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -781,44 +781,6 @@ sal_Bool SwAccessibleParagraph::GetWordBoundary(
// (DICTIONARY_WORD includes punctuation, ANY_WORD doesn't.)
const sal_uInt16 nWordType = i18n::WordType::ANY_WORD;
-/*
- // get word boundary, as the Break-Iterator sees fit.
- sal_Unicode SpaceChar(' ');
- if (rText.getCodePointAt(nPos) == SpaceChar)
- {
- int nStartPos = nPos;
- int nEndPos = nPos+1;
- while (nStartPos >= 0 && rText.getCodePointAt(nStartPos) == SpaceChar)
- --nStartPos;
- while (nEndPos < rText.getLength() && rText.getCodePointAt(nEndPos) == SpaceChar)
- ++nEndPos;
- //Get the previous word boundary + the followed space characters
- if (nStartPos >= 0)
- {
- rBound = pBreakIt->xBreak->getWordBoundary( rText, nStartPos, aLocale, nWordType, sal_True );
- rBound.endPos += (nEndPos-nStartPos - 1);
- }
- //When the frontal characters are whitespace, return the all space characters directly.
- else
- {
- rBound.startPos = 0;
- rBound.endPos = nEndPos;
- }
- }
- // add the " " into the word boundry
- else
- {
- rBound = pBreakIt->xBreak->getWordBoundary(rText, nPos, aLocale, nWordType, sal_True );
- sal_Int32 nEndPos = rBound.endPos, nLength = rText.getLength();
- while ( nEndPos < nLength && rText.getCodePointAt(nEndPos) == SpaceChar )
- nEndPos++;
- rBound.endPos = nEndPos;
- }
- tabCharInWord( nPos, rBound);
- if( GetPortionData().FillBoundaryIFDateField( rBound, rBound.startPos) )
- return sal_True;
- return sal_True; // MT: So why do we need the return TRUE above???
-*/
// get word boundary, as the Break-Iterator sees fit.
rBound = g_pBreakIt->GetBreakIter()->getWordBoundary(
rText, nPos, aLocale, nWordType, sal_True );
@@ -4146,26 +4108,4 @@ uno::Any SAL_CALL SwAccessibleParagraph::getExtendedAttributes()
return Ret;
}
-//Tab will be return when call WORDTYPE
-sal_Bool SwAccessibleParagraph::tabCharInWord( sal_Int32 nIndex, i18n::Boundary& aBound)
-{
- sal_Bool bFind = sal_False;
- if( aBound.startPos != nIndex)
- {
- OUString tabStr;
- if(aBound.startPos>nIndex)
- tabStr = GetString().copy(nIndex,(aBound.startPos - nIndex) );
-
- sal_Unicode tabChar('\t');
- sal_Int32 tabIndex = tabStr.indexOf(tabChar);
- if( tabIndex > -1 )
- {
- aBound.startPos = nIndex + tabIndex ;
- aBound.endPos = aBound.startPos + 1;
- bFind = sal_True;
- }
- }
- return bFind;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/access/accpara.hxx b/sw/source/core/access/accpara.hxx
index a8bea06..1dbfa32 100644
--- a/sw/source/core/access/accpara.hxx
+++ b/sw/source/core/access/accpara.hxx
@@ -439,7 +439,6 @@ public:
sal_Int32 GetRealHeadingLevel();
// XAccessibleComponent
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list