[Libreoffice-commits] core.git: Branch 'feature/gsoc15-open-remote-files-dialog' - 9 commits - accessibility/inc avmedia/source basctl/source basic/qa codemaker/source compilerplugins/clang configmgr/source cui/source dbaccess/source editeng/source embeddedobj/source extensions/source fpicker/source include/basebmp include/basegfx include/editeng include/linguistic include/sfx2 include/svtools include/tools include/vcl linguistic/source sfx2/source svtools/source sw/inc sw/source
Szymon Kłos
eszkadev at gmail.com
Tue Jul 28 01:34:11 PDT 2015
accessibility/inc/accessibility/extended/AccessibleGridControl.hxx | 15 --
avmedia/source/gstreamer/gstplayer.cxx | 2
avmedia/source/gstreamer/gstwindow.cxx | 4
avmedia/source/gstreamer/gstwindow.hxx | 10 -
basctl/source/basicide/baside2.hxx | 3
basctl/source/basicide/bastype2.hxx | 5
basctl/source/basicide/bastype3.hxx | 1
basctl/source/basicide/iderdll.cxx | 1
basctl/source/basicide/iderdll2.hxx | 6
basctl/source/basicide/moduldlg.hxx | 2
basctl/source/inc/basidesh.hxx | 3
basctl/source/inc/bastypes.hxx | 13 -
basctl/source/inc/dlged.hxx | 1
basctl/source/inc/dlgedobj.hxx | 3
basctl/source/inc/propbrw.hxx | 1
basic/qa/cppunit/basictest.hxx | 9 -
codemaker/source/cppumaker/dependencies.hxx | 16 --
codemaker/source/cppumaker/includes.hxx | 2
compilerplugins/clang/unusedmethods.cxx | 34 +---
compilerplugins/clang/unusedmethods.py | 5
configmgr/source/nodemap.hxx | 1
configmgr/source/writemodfile.cxx | 2
configmgr/source/writemodfile.hxx | 2
cui/source/inc/cfg.hxx | 1
dbaccess/source/core/api/CacheSet.cxx | 6
dbaccess/source/core/api/CacheSet.hxx | 1
dbaccess/source/core/api/KeySet.cxx | 10 -
dbaccess/source/core/api/KeySet.hxx | 1
dbaccess/source/core/api/StaticSet.cxx | 9 -
dbaccess/source/core/api/StaticSet.hxx | 1
dbaccess/source/core/api/query.hxx | 1
dbaccess/source/core/inc/ContentHelper.hxx | 3
editeng/source/items/numitem.cxx | 4
editeng/source/outliner/outlin2.cxx | 5
editeng/source/outliner/outliner.cxx | 11 -
editeng/source/uno/unoipset.cxx | 4
embeddedobj/source/commonembedding/miscobj.cxx | 40 -----
embeddedobj/source/commonembedding/specialobject.cxx | 23 ---
embeddedobj/source/inc/commonembobj.hxx | 5
embeddedobj/source/inc/docholder.hxx | 3
embeddedobj/source/inc/oleembobj.hxx | 29 +--
embeddedobj/source/inc/specialobject.hxx | 4
extensions/source/abpilot/abspilot.hxx | 5
extensions/source/bibliography/bibcont.hxx | 3
extensions/source/bibliography/datman.hxx | 2
extensions/source/dbpilots/gridwizard.hxx | 3
extensions/source/propctrlr/browserview.hxx | 1
extensions/source/propctrlr/formmetadata.cxx | 7
extensions/source/propctrlr/formmetadata.hxx | 1
extensions/source/propctrlr/propertyeditor.hxx | 2
extensions/source/propctrlr/propertyinfo.hxx | 3
extensions/source/scanner/scanner.hxx | 5
fpicker/source/office/RemoteFilesDialog.cxx | 9 -
include/basebmp/colormisc.hxx | 12 -
include/basegfx/pixel/bpixel.hxx | 3
include/basegfx/point/b3dpoint.hxx | 5
include/basegfx/range/basicbox.hxx | 55 -------
include/editeng/numitem.hxx | 1
include/editeng/outliner.hxx | 12 -
include/editeng/unoipset.hxx | 6
include/linguistic/lngprops.hxx | 24 ---
include/sfx2/frame.hxx | 4
include/sfx2/frmdescr.hxx | 24 +--
include/svtools/fileview.hxx | 2
include/svtools/foldertree.hxx | 3
include/tools/urlobj.hxx | 18 --
include/vcl/gdimtf.hxx | 8 -
linguistic/source/lngopt.cxx | 74 +++++-----
sfx2/source/doc/frmdescr.cxx | 11 -
svtools/source/contnr/fileview.cxx | 15 ++
svtools/source/contnr/foldertree.cxx | 56 +++++--
svtools/source/misc/imagemgr.cxx | 4
sw/inc/numrule.hxx | 1
sw/source/core/doc/number.cxx | 6
sw/source/uibase/docvw/AnnotationWin.cxx | 4
75 files changed, 175 insertions(+), 516 deletions(-)
New commits:
commit 97f6c27471e42cfd508d1efc72da7ae1931bbe69
Author: Szymon Kłos <eszkadev at gmail.com>
Date: Tue Jul 28 10:30:58 2015 +0200
reuse data from SvtFileView in the FolderTree
Change-Id: I5a830459e7d5d9c71b7997b9014dde048b317d81
diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx
index 8607af6..cf70a36 100644
--- a/fpicker/source/office/RemoteFilesDialog.cxx
+++ b/fpicker/source/office/RemoteFilesDialog.cxx
@@ -1082,8 +1082,6 @@ void RemoteFilesDialog::UpdateControls( const OUString& rURL )
OUString* sData = new OUString( rURL );
pRoot->SetUserData( static_cast< void* >( sData ) );
- m_pTreeView->Expand( pRoot );
-
m_pName_ed->GrabFocus();
m_sLastServiceUrl = sURL;
@@ -1092,8 +1090,13 @@ void RemoteFilesDialog::UpdateControls( const OUString& rURL )
}
m_pPath->SetURL( rURL );
+
m_pTreeView->SetSelectHdl( Link<>() );
- m_pTreeView->SetTreePath( rURL );
+
+ // read cached data for this url and fill the tree
+ const ::std::vector< std::pair< OUString, OUString > >& rFolders = m_pFileView->GetSubFolders();
+ m_pTreeView->FillTreeEntry( rURL, rFolders );
+
m_pTreeView->SetSelectHdl( LINK( this, RemoteFilesDialog, TreeSelectHdl ) );
m_bIsConnected = true;
diff --git a/include/svtools/fileview.hxx b/include/svtools/fileview.hxx
index 6bb6415..6946975 100644
--- a/include/svtools/fileview.hxx
+++ b/include/svtools/fileview.hxx
@@ -173,6 +173,8 @@ public:
void EndInplaceEditing( bool _bCancel );
+ ::std::vector< std::pair< OUString, OUString > > GetSubFolders();
+
protected:
virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE;
};
diff --git a/include/svtools/foldertree.hxx b/include/svtools/foldertree.hxx
index 4be22b9..ccf0382 100644
--- a/include/svtools/foldertree.hxx
+++ b/include/svtools/foldertree.hxx
@@ -42,12 +42,15 @@ private:
Image m_aFolderImage;
Image m_aFolderExpandedImage;
+ OUString m_sLastUpdatedDir;
+
public:
FolderTree( vcl::Window* pParent, WinBits nBits );
virtual void RequestingChildren( SvTreeListEntry* pEntry ) SAL_OVERRIDE;
void FillTreeEntry( SvTreeListEntry* pEntry );
+ void FillTreeEntry( const OUString & rUrl, const ::std::vector< std::pair< OUString, OUString > >& rFolders );
void SetTreePath( OUString const & sUrl );
void SetBlackList( const ::com::sun::star::uno::Sequence< OUString >& rBlackList );
};
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index c85b1dd..32b1d66 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -1468,6 +1468,21 @@ OUString SvtFileView::GetConfigString() const
return sRet;
}
+::std::vector< std::pair< OUString, OUString > > SvtFileView::GetSubFolders()
+{
+ ::std::vector< std::pair< OUString, OUString > > aContent;
+
+ for( ::std::vector< SortingData_Impl* >::size_type i = 0; i < mpImp->maContent.size(); i++ )
+ {
+ if( mpImp->maContent[i]->mbIsFolder )
+ {
+ std::pair< OUString, OUString > aEntry( mpImp->maContent[i]->GetTitle(), mpImp->maContent[i]->maTargetURL );
+ aContent.push_back( aEntry );
+ }
+ }
+
+ return aContent;
+}
void SvtFileView::SetConfigString( const OUString& rCfgStr )
{
diff --git a/svtools/source/contnr/foldertree.cxx b/svtools/source/contnr/foldertree.cxx
index d597168..636fce6 100644
--- a/svtools/source/contnr/foldertree.cxx
+++ b/svtools/source/contnr/foldertree.cxx
@@ -34,22 +34,22 @@ void FolderTree::FillTreeEntry( SvTreeListEntry* pEntry )
{
if( pEntry )
{
- while( GetChildCount( pEntry ) > 0 )
+ OUString* pURL = static_cast< OUString* >( pEntry->GetUserData() );
+
+ if( pURL && m_sLastUpdatedDir != *pURL )
{
- SvTreeListEntry* pChild = FirstChild( pEntry );
- GetModel()->Remove( pChild );
- }
+ while( GetChildCount( pEntry ) > 0 )
+ {
+ SvTreeListEntry* pChild = FirstChild( pEntry );
+ GetModel()->Remove( pChild );
+ }
- ::std::vector< SortingData_Impl* > aContent;
+ ::std::vector< SortingData_Impl* > aContent;
- ::rtl::Reference< ::svt::FileViewContentEnumerator >
- xContentEnumerator(new FileViewContentEnumerator(
- m_xEnv, aContent, m_aMutex, NULL));
+ ::rtl::Reference< ::svt::FileViewContentEnumerator >
+ xContentEnumerator(new FileViewContentEnumerator(
+ m_xEnv, aContent, m_aMutex, NULL));
- OUString* pURL = static_cast< OUString* >( pEntry->GetUserData() );
-
- if( pURL )
- {
FolderDescriptor aFolder( *pURL );
EnumerationResult eResult =
@@ -70,6 +70,38 @@ void FolderTree::FillTreeEntry( SvTreeListEntry* pEntry )
}
}
}
+ else
+ {
+ // this dir was updated recently
+ // next time read this remote folder
+ m_sLastUpdatedDir = "";
+ }
+}
+
+void FolderTree::FillTreeEntry( const OUString & rUrl, const ::std::vector< std::pair< OUString, OUString > >& rFolders )
+{
+ SetTreePath( rUrl );
+
+ SvTreeListEntry* pParent = GetCurEntry();
+
+ if( pParent && !IsExpanded( pParent ) )
+ {
+ while( GetChildCount( pParent ) > 0 )
+ {
+ SvTreeListEntry* pChild = FirstChild( pParent );
+ GetModel()->Remove( pChild );
+ }
+
+ for(::std::vector< std::pair< OUString, OUString > >::const_iterator it = rFolders.begin(); it != rFolders.end() ; ++it)
+ {
+ SvTreeListEntry* pNewEntry = InsertEntry( it->first, pParent, true );
+ OUString* sData = new OUString( it->second );
+ pNewEntry->SetUserData( static_cast< void* >( sData ) );
+ }
+
+ m_sLastUpdatedDir = rUrl;
+ Expand( pParent );
+ }
}
void FolderTree::SetTreePath( OUString const & sUrl )
commit dcf94ab56d9e5e9864965f56d27045e67b093fa4
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Fri Jul 24 12:34:19 2015 +0200
tdf#92911 SwAnnotationWin rendercontext: fix missing comment contents
The problem was that when inserting a post-it comment, the Paint() is
triggered for SwEditWin, which then shares a RenderContext with its
children, and at the end paints the buffer to the vcl::Window of
SwEditWin. When painting this buffer, the contents of SwAnnotationWin
was missing, as the parent SwEditWin was not allowed to paint on that
area. No explicit clipping is set at the OutputDevice level, but
vcl::Window::ImplClipChildren() still calculates a clip region based on
the child windows for the underlying SalGraphics, and that prevented
SwEditWin to paint its buffer fully.
Fix the problem by explicitly disabling this clipping for
SwAnnotationWin in its ctor in the rendercontext case.
Change-Id: I5eb47c20070057a79297d91242624fc2057e2dfb
diff --git a/sw/source/uibase/docvw/AnnotationWin.cxx b/sw/source/uibase/docvw/AnnotationWin.cxx
index 9ce682a..efe8876 100644
--- a/sw/source/uibase/docvw/AnnotationWin.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin.cxx
@@ -66,6 +66,10 @@ SwAnnotationWin::SwAnnotationWin( SwEditWin& rEditWin,
, mpField( static_cast<SwPostItField*>(aField->GetField()))
, mpButtonPopup(0)
{
+ if (SupportsDoubleBuffering())
+ // When double-buffering, allow parents to paint on our area. That's
+ // necessary when parents paint the complete buffer.
+ SetParentClipMode(ParentClipMode::NoClip);
}
SwAnnotationWin::~SwAnnotationWin()
commit 28bc82d8dcc7a65e9c88ff311ac981d556a4896e
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Jul 24 12:57:21 2015 +0200
-Werror,-Wunused-private-field
Change-Id: Ie88293e847a3f9a49d34166a1518ba8fe31577b8
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index e42a10e..70584ba 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -216,7 +216,6 @@ private:
OUString aHelpText;
OUString aLabel;
OUString aCommand;
- OUString aHelpURL;
bool bPopUp;
bool bStrEdited;
commit 1aab6c8e3d314d601923dd18e252ab30020d0105
Author: Noel Grandin <noel at peralex.com>
Date: Fri Jul 24 11:32:09 2015 +0200
remove unused define TF_NEWDESKTOP
Change-Id: Ibab48696036d0e7d23c87f11e1e800782dddb366
diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx
index 5768a3b..a47ad2b 100644
--- a/include/sfx2/frame.hxx
+++ b/include/sfx2/frame.hxx
@@ -19,10 +19,6 @@
#ifndef INCLUDED_SFX2_FRAME_HXX
#define INCLUDED_SFX2_FRAME_HXX
-#ifndef TF_NEWDESKTOP
-#define TF_NEWDESKTOP 1
-#endif
-
#include <sal/config.h>
#include <sfx2/dllapi.h>
#include <sal/types.h>
commit e8c3b599237b915cfdd5df2dedb1b4b4a46f0e47
Author: Noel Grandin <noel at peralex.com>
Date: Fri Jul 24 11:23:55 2015 +0200
in SfxFrameDescriptor, use normal bool
instead of hard to understand bitmasking
Change-Id: I5f694285af87223b8ccaa50031cbb3c09924e1a8
diff --git a/include/sfx2/frmdescr.hxx b/include/sfx2/frmdescr.hxx
index fbc14c7..34db792 100644
--- a/include/sfx2/frmdescr.hxx
+++ b/include/sfx2/frmdescr.hxx
@@ -57,9 +57,6 @@ enum SizeSelector
SIZE_REL
};
-#define BORDER_SET 2
-#define BORDER_YES 1
-#define BORDER_NO 0
#define SPACING_NOT_SET -1L
#define SIZE_NOT_SET -1L
@@ -75,7 +72,8 @@ class SFX2_DLLPUBLIC SfxFrameDescriptor
long nWidth;
ScrollingMode eScroll;
SizeSelector eSizeSelector;
- sal_uInt16 nHasBorder;
+ bool bHasBorder;
+ bool bHasBorderSet;
sal_uInt16 nItemId;
bool bResizeHorizontal;
bool bResizeVertical;
@@ -119,23 +117,19 @@ public:
void SetScrollingMode( ScrollingMode eMode )
{ eScroll = eMode; }
- // FrameBorder
void SetWallpaper( const Wallpaper& rWallpaper );
- bool HasFrameBorder() const;
+ // FrameBorder
+ bool HasFrameBorder() const
+ { return bHasBorder; }
bool IsFrameBorderOn() const
- { return ( nHasBorder & BORDER_YES ) != 0; }
-
+ { return bHasBorder; }
void SetFrameBorder( bool bBorder )
- {
- nHasBorder = bBorder ?
- BORDER_YES | BORDER_SET :
- BORDER_NO | BORDER_SET;
- }
+ { bHasBorder = bBorder; bHasBorderSet = true; }
bool IsFrameBorderSet() const
- { return (nHasBorder & BORDER_SET) != 0; }
+ { return bHasBorderSet; }
void ResetBorder()
- { nHasBorder = 0; }
+ { bHasBorder = false; bHasBorderSet = false; }
// Copy for example for Views
SfxFrameDescriptor* Clone( bool bWithIds = true ) const;
diff --git a/sfx2/source/doc/frmdescr.cxx b/sfx2/source/doc/frmdescr.cxx
index d3a2ba0..8ce26e5 100644
--- a/sfx2/source/doc/frmdescr.cxx
+++ b/sfx2/source/doc/frmdescr.cxx
@@ -45,7 +45,8 @@ SfxFrameDescriptor::SfxFrameDescriptor() :
nWidth( 0L ),
eScroll( ScrollingAuto ),
eSizeSelector( SIZE_ABS ),
- nHasBorder( BORDER_YES ),
+ bHasBorder( true ),
+ bHasBorderSet( false ),
nItemId( 0 ),
bResizeHorizontal( true ),
bResizeVertical( true ),
@@ -109,7 +110,8 @@ SfxFrameDescriptor* SfxFrameDescriptor::Clone( bool bWithIds ) const
pFrame->eScroll = eScroll;
pFrame->bResizeHorizontal = bResizeHorizontal;
pFrame->bResizeVertical = bResizeVertical;
- pFrame->nHasBorder = nHasBorder;
+ pFrame->bHasBorder = bHasBorder;
+ pFrame->bHasBorderSet = bHasBorderSet;
pFrame->bHasUI = bHasUI;
pFrame->SetReadOnly( IsReadOnly() );
pFrame->SetEditable( IsEditable() );
@@ -130,11 +132,6 @@ SfxFrameDescriptor* SfxFrameDescriptor::Clone( bool bWithIds ) const
return pFrame;
}
-bool SfxFrameDescriptor::HasFrameBorder() const
-{
- return (nHasBorder & BORDER_YES) != 0;
-}
-
void SfxFrameDescriptor::SetWallpaper( const Wallpaper& rWallpaper )
{
DELETEZ( pImp->pWallpaper );
commit 93774f29ec42e86b55e89e3f13c011673a55c3ce
Author: Noel Grandin <noel at peralex.com>
Date: Fri Jul 24 11:01:45 2015 +0200
remove unused URL_PREFIX_PRIV constants
Change-Id: I4d49ebec2867e4c53661c20b277bfdbf4fd222a2
diff --git a/include/tools/urlobj.hxx b/include/tools/urlobj.hxx
index 96bc0cd..7778666 100644
--- a/include/tools/urlobj.hxx
+++ b/include/tools/urlobj.hxx
@@ -43,24 +43,6 @@ namespace com { namespace sun { namespace star { namespace util {
#define INET_HID_SCHEME "hid:"
#define URL_PREFIX_PRIV_SOFFICE "private:"
-enum
-{
- URL_PREFIX_PRIV_SOFFICE_LEN
- = RTL_CONSTASCII_LENGTH(URL_PREFIX_PRIV_SOFFICE)
-};
-
-#define URL_PREFIX_PRIV_OBSOLETE URL_PREFIX_PRIV_SOFFICE
-enum
-{
- URL_PREFIX_PRIV_OBSOLETE_LEN
- = RTL_CONSTASCII_LENGTH(URL_PREFIX_PRIV_OBSOLETE)
-};
-
-#define URL_PREFIX_PRIV_EXTERN "staroffice:"
-enum
-{
- URL_PREFIX_PRIV_EXTERN_LEN = RTL_CONSTASCII_LENGTH(URL_PREFIX_PRIV_EXTERN)
-};
// Schemes:
enum class INetProtocol
diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx
index 45eae76..bef17b0 100644
--- a/svtools/source/misc/imagemgr.cxx
+++ b/svtools/source/misc/imagemgr.cxx
@@ -358,7 +358,7 @@ static sal_uInt16 GetImageId_Impl( const INetURLObject& rObject, bool bDetectFol
if ( rObject.GetProtocol() == INetProtocol::PrivSoffice )
{
- OUString aURLPath = sURL.copy( URL_PREFIX_PRIV_SOFFICE_LEN );
+ OUString aURLPath = sURL.copy( strlen(URL_PREFIX_PRIV_SOFFICE) );
OUString aType = aURLPath.getToken( 0, '/' );
if ( aType == "factory" )
{
@@ -536,7 +536,7 @@ OUString SvFileInformationManager::GetDescription_Impl( const INetURLObject& rOb
if ( rObject.GetProtocol() == INetProtocol::PrivSoffice )
{
- OUString aURLPath = sURL.copy( URL_PREFIX_PRIV_SOFFICE_LEN );
+ OUString aURLPath = sURL.copy( strlen(URL_PREFIX_PRIV_SOFFICE) );
OUString aType = aURLPath.getToken( 0, '/' );
if ( aType == "factory" )
{
commit c29e194b4c37e0735c3bae8b35902c7401e7964a
Author: Noel Grandin <noel at peralex.com>
Date: Fri Jul 24 10:33:47 2015 +0200
no need to redeclare these constants with slightly different names
Change-Id: Ic9a1f2f0cef25baaf8b97db4989dc536a5da89f7
diff --git a/include/linguistic/lngprops.hxx b/include/linguistic/lngprops.hxx
index 77d411a..af73f3b 100644
--- a/include/linguistic/lngprops.hxx
+++ b/include/linguistic/lngprops.hxx
@@ -26,30 +26,6 @@
// (may not include results added by looking up user dictionaries)
#define UPN_MAX_NUMBER_OF_SUGGESTIONS "MaxNumberOfSuggestions"
-// WIDs for property names
-//!! Don't change values! They are used as the property handles in
-//!! the service description
-#define WID_IS_GERMAN_PRE_REFORM UPH_IS_GERMAN_PRE_REFORM /*! deprecated !*/
-#define WID_IS_USE_DICTIONARY_LIST UPH_IS_USE_DICTIONARY_LIST
-#define WID_IS_IGNORE_CONTROL_CHARACTERS UPH_IS_IGNORE_CONTROL_CHARACTERS
-#define WID_IS_SPELL_UPPER_CASE UPH_IS_SPELL_UPPER_CASE
-#define WID_IS_SPELL_WITH_DIGITS UPH_IS_SPELL_WITH_DIGITS
-#define WID_IS_SPELL_CAPITALIZATION UPH_IS_SPELL_CAPITALIZATION
-#define WID_HYPH_MIN_LEADING UPH_HYPH_MIN_LEADING
-#define WID_HYPH_MIN_TRAILING UPH_HYPH_MIN_TRAILING
-#define WID_HYPH_MIN_WORD_LENGTH UPH_HYPH_MIN_WORD_LENGTH
-#define WID_DEFAULT_LOCALE UPH_DEFAULT_LOCALE
-#define WID_IS_SPELL_AUTO UPH_IS_SPELL_AUTO
-#define WID_IS_SPELL_HIDE UPH_IS_SPELL_HIDE /*! deprecated !*/
-#define WID_IS_SPELL_IN_ALL_LANGUAGES UPH_IS_SPELL_IN_ALL_LANGUAGES /*! deprecated !*/
-#define WID_IS_SPELL_SPECIAL UPH_IS_SPELL_SPECIAL
-#define WID_IS_HYPH_AUTO UPH_IS_HYPH_AUTO
-#define WID_IS_HYPH_SPECIAL UPH_IS_HYPH_SPECIAL
-#define WID_IS_WRAP_REVERSE UPH_IS_WRAP_REVERSE
-#define WID_DEFAULT_LANGUAGE UPH_DEFAULT_LANGUAGE
-#define WID_DEFAULT_LOCALE_CJK UPH_DEFAULT_LOCALE_CJK
-#define WID_DEFAULT_LOCALE_CTL UPH_DEFAULT_LOCALE_CTL
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx
index 38327b8..d07b4da 100644
--- a/linguistic/source/lngopt.cxx
+++ b/linguistic/source/lngopt.cxx
@@ -98,29 +98,29 @@ struct WID_Name
WID_Name aWID_Name[] =
{
{ 0, 0 },
- { WID_IS_USE_DICTIONARY_LIST, UPN_IS_USE_DICTIONARY_LIST },
- { WID_IS_IGNORE_CONTROL_CHARACTERS, UPN_IS_IGNORE_CONTROL_CHARACTERS },
- { WID_IS_SPELL_UPPER_CASE, UPN_IS_SPELL_UPPER_CASE },
- { WID_IS_SPELL_WITH_DIGITS, UPN_IS_SPELL_WITH_DIGITS },
- { WID_IS_SPELL_CAPITALIZATION, UPN_IS_SPELL_CAPITALIZATION },
- { WID_HYPH_MIN_LEADING, UPN_HYPH_MIN_LEADING },
- { WID_HYPH_MIN_TRAILING, UPN_HYPH_MIN_TRAILING },
- { WID_HYPH_MIN_WORD_LENGTH, UPN_HYPH_MIN_WORD_LENGTH },
- { WID_DEFAULT_LOCALE, UPN_DEFAULT_LOCALE },
- { WID_IS_SPELL_AUTO, UPN_IS_SPELL_AUTO },
+ { UPH_IS_USE_DICTIONARY_LIST, UPN_IS_USE_DICTIONARY_LIST },
+ { UPH_IS_IGNORE_CONTROL_CHARACTERS, UPN_IS_IGNORE_CONTROL_CHARACTERS },
+ { UPH_IS_SPELL_UPPER_CASE, UPN_IS_SPELL_UPPER_CASE },
+ { UPH_IS_SPELL_WITH_DIGITS, UPN_IS_SPELL_WITH_DIGITS },
+ { UPH_IS_SPELL_CAPITALIZATION, UPN_IS_SPELL_CAPITALIZATION },
+ { UPH_HYPH_MIN_LEADING, UPN_HYPH_MIN_LEADING },
+ { UPH_HYPH_MIN_TRAILING, UPN_HYPH_MIN_TRAILING },
+ { UPH_HYPH_MIN_WORD_LENGTH, UPN_HYPH_MIN_WORD_LENGTH },
+ { UPH_DEFAULT_LOCALE, UPN_DEFAULT_LOCALE },
+ { UPH_IS_SPELL_AUTO, UPN_IS_SPELL_AUTO },
{ 0, 0 },
{ 0, 0 },
- { WID_IS_SPELL_SPECIAL, UPN_IS_SPELL_SPECIAL },
- { WID_IS_HYPH_AUTO, UPN_IS_HYPH_AUTO },
- { WID_IS_HYPH_SPECIAL, UPN_IS_HYPH_SPECIAL },
- { WID_IS_WRAP_REVERSE, UPN_IS_WRAP_REVERSE },
+ { UPH_IS_SPELL_SPECIAL, UPN_IS_SPELL_SPECIAL },
+ { UPH_IS_HYPH_AUTO, UPN_IS_HYPH_AUTO },
+ { UPH_IS_HYPH_SPECIAL, UPN_IS_HYPH_SPECIAL },
+ { UPH_IS_WRAP_REVERSE, UPN_IS_WRAP_REVERSE },
{ 0, 0 },
{ 0, 0 },
{ 0, 0 },
{ 0, 0 },
- { WID_DEFAULT_LANGUAGE, UPN_DEFAULT_LANGUAGE },
- { WID_DEFAULT_LOCALE_CJK, UPN_DEFAULT_LOCALE_CJK },
- { WID_DEFAULT_LOCALE_CTL, UPN_DEFAULT_LOCALE_CTL }
+ { UPH_DEFAULT_LANGUAGE, UPN_DEFAULT_LANGUAGE },
+ { UPH_DEFAULT_LOCALE_CJK, UPN_DEFAULT_LOCALE_CJK },
+ { UPH_DEFAULT_LOCALE_CTL, UPN_DEFAULT_LOCALE_CTL }
};
@@ -146,45 +146,45 @@ static const SfxItemPropertyMapEntry* lcl_GetLinguProps()
{
static const SfxItemPropertyMapEntry aLinguProps[] =
{
- { OUString(UPN_DEFAULT_LANGUAGE), WID_DEFAULT_LANGUAGE,
+ { OUString(UPN_DEFAULT_LANGUAGE), UPH_DEFAULT_LANGUAGE,
::cppu::UnoType<sal_Int16>::get(), 0, 0 },
- { OUString(UPN_DEFAULT_LOCALE), WID_DEFAULT_LOCALE,
+ { OUString(UPN_DEFAULT_LOCALE), UPH_DEFAULT_LOCALE,
::cppu::UnoType<Locale>::get(), 0, 0 },
- { OUString(UPN_DEFAULT_LOCALE_CJK), WID_DEFAULT_LOCALE_CJK,
+ { OUString(UPN_DEFAULT_LOCALE_CJK), UPH_DEFAULT_LOCALE_CJK,
::cppu::UnoType<Locale>::get(), 0, 0 },
- { OUString(UPN_DEFAULT_LOCALE_CTL), WID_DEFAULT_LOCALE_CTL,
+ { OUString(UPN_DEFAULT_LOCALE_CTL), UPH_DEFAULT_LOCALE_CTL,
::cppu::UnoType<Locale>::get(), 0, 0 },
- { OUString(UPN_HYPH_MIN_LEADING), WID_HYPH_MIN_LEADING,
+ { OUString(UPN_HYPH_MIN_LEADING), UPH_HYPH_MIN_LEADING,
::cppu::UnoType<sal_Int16>::get(), 0, 0 },
- { OUString(UPN_HYPH_MIN_TRAILING), WID_HYPH_MIN_TRAILING,
+ { OUString(UPN_HYPH_MIN_TRAILING), UPH_HYPH_MIN_TRAILING,
::cppu::UnoType<sal_Int16>::get(), 0, 0 },
- { OUString(UPN_HYPH_MIN_WORD_LENGTH), WID_HYPH_MIN_WORD_LENGTH,
+ { OUString(UPN_HYPH_MIN_WORD_LENGTH), UPH_HYPH_MIN_WORD_LENGTH,
::cppu::UnoType<sal_Int16>::get(), 0, 0 },
- { OUString(UPN_IS_GERMAN_PRE_REFORM), WID_IS_GERMAN_PRE_REFORM, /*! deprecated !*/
+ { OUString(UPN_IS_GERMAN_PRE_REFORM), UPH_IS_GERMAN_PRE_REFORM, /*! deprecated !*/
cppu::UnoType<bool>::get(), 0, 0 },
- { OUString(UPN_IS_HYPH_AUTO), WID_IS_HYPH_AUTO,
+ { OUString(UPN_IS_HYPH_AUTO), UPH_IS_HYPH_AUTO,
cppu::UnoType<bool>::get(), 0, 0 },
- { OUString(UPN_IS_HYPH_SPECIAL), WID_IS_HYPH_SPECIAL,
+ { OUString(UPN_IS_HYPH_SPECIAL), UPH_IS_HYPH_SPECIAL,
cppu::UnoType<bool>::get(), 0, 0 },
- { OUString(UPN_IS_IGNORE_CONTROL_CHARACTERS), WID_IS_IGNORE_CONTROL_CHARACTERS,
+ { OUString(UPN_IS_IGNORE_CONTROL_CHARACTERS), UPH_IS_IGNORE_CONTROL_CHARACTERS,
cppu::UnoType<bool>::get(), 0, 0 },
- { OUString(UPN_IS_SPELL_AUTO), WID_IS_SPELL_AUTO,
+ { OUString(UPN_IS_SPELL_AUTO), UPH_IS_SPELL_AUTO,
cppu::UnoType<bool>::get(), 0, 0 },
- { OUString(UPN_IS_SPELL_CAPITALIZATION), WID_IS_SPELL_CAPITALIZATION,
+ { OUString(UPN_IS_SPELL_CAPITALIZATION), UPH_IS_SPELL_CAPITALIZATION,
cppu::UnoType<bool>::get(), 0, 0 },
- { OUString(UPN_IS_SPELL_HIDE), WID_IS_SPELL_HIDE, /*! deprecated !*/
+ { OUString(UPN_IS_SPELL_HIDE), UPH_IS_SPELL_HIDE, /*! deprecated !*/
cppu::UnoType<bool>::get(), 0, 0 },
- { OUString(UPN_IS_SPELL_IN_ALL_LANGUAGES), WID_IS_SPELL_IN_ALL_LANGUAGES, /*! deprecated !*/
+ { OUString(UPN_IS_SPELL_IN_ALL_LANGUAGES), UPH_IS_SPELL_IN_ALL_LANGUAGES, /*! deprecated !*/
cppu::UnoType<bool>::get(), 0, 0 },
- { OUString(UPN_IS_SPELL_SPECIAL), WID_IS_SPELL_SPECIAL,
+ { OUString(UPN_IS_SPELL_SPECIAL), UPH_IS_SPELL_SPECIAL,
cppu::UnoType<bool>::get(), 0, 0 },
- { OUString(UPN_IS_SPELL_UPPER_CASE), WID_IS_SPELL_UPPER_CASE,
+ { OUString(UPN_IS_SPELL_UPPER_CASE), UPH_IS_SPELL_UPPER_CASE,
cppu::UnoType<bool>::get(), 0, 0 },
- { OUString(UPN_IS_SPELL_WITH_DIGITS), WID_IS_SPELL_WITH_DIGITS,
+ { OUString(UPN_IS_SPELL_WITH_DIGITS), UPH_IS_SPELL_WITH_DIGITS,
cppu::UnoType<bool>::get(), 0, 0 },
- { OUString(UPN_IS_USE_DICTIONARY_LIST), WID_IS_USE_DICTIONARY_LIST,
+ { OUString(UPN_IS_USE_DICTIONARY_LIST), UPH_IS_USE_DICTIONARY_LIST,
cppu::UnoType<bool>::get(), 0, 0 },
- { OUString(UPN_IS_WRAP_REVERSE), WID_IS_WRAP_REVERSE,
+ { OUString(UPN_IS_WRAP_REVERSE), UPH_IS_WRAP_REVERSE,
cppu::UnoType<bool>::get(), 0, 0 },
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
commit 22bd00fa7f6b90964e5eca03c314cdfa7ac2be12
Author: Noel Grandin <noel at peralex.com>
Date: Fri Jul 24 09:55:22 2015 +0200
remove unused #defines METAFILE_END and METAFILE_LABEL_NOTFOUND
Change-Id: I57ef70345ffd4cce10499df9e2567c28074709d8
diff --git a/include/vcl/gdimtf.hxx b/include/vcl/gdimtf.hxx
index 1dca8a9..4a50b65 100644
--- a/include/vcl/gdimtf.hxx
+++ b/include/vcl/gdimtf.hxx
@@ -45,14 +45,6 @@ class Gradient;
#define GDI_METAFILE_END ((size_t)0xFFFFFFFF)
#define GDI_METAFILE_LABEL_NOTFOUND ((size_t)0xFFFFFFFF)
-#ifndef METAFILE_END
-#define METAFILE_END GDI_METAFILE_END
-#endif
-
-#ifndef METAFILE_LABEL_NOTFOUND
-#define METAFILE_LABEL_NOTFOUND GDI_METAFILE_LABEL_NOTFOUND
-#endif
-
enum MtfConversion
{
MTF_CONVERSION_NONE = 0,
commit 38023af6c13602ae1856bea11693c18c0c3efa36
Author: Noel Grandin <noel at peralex.com>
Date: Thu Jul 23 09:49:57 2015 +0200
loplugin:unusedmethods
Change-Id: If5090c330e12d6e537766bf4a9be0a2360381a7a
Reviewed-on: https://gerrit.libreoffice.org/17312
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
index a9e09dd..8aef5c7 100644
--- a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
@@ -113,21 +113,6 @@ public:
*/
void commitTableEvent(sal_Int16 nEventId, const css::uno::Any& rNewValue,
const css::uno::Any& rOldValue);
- /** returns the accessible object for the row or the column header bar
- */
- inline css::uno::Reference< css::accessibility::XAccessible >
- getHeaderBar( ::svt::table::AccessibleTableControlObjType _eObjType )
- {
- return implGetHeaderBar(_eObjType);
- }
-
- /** returns the accessible object for the table representation
- */
- inline css::uno::Reference< css::accessibility::XAccessible >
- getTable( )
- {
- return implGetTable();
- }
protected:
// internal virtual methods -----------------------------------------------
diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx
index d12e8e9..eb64d1d 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -887,7 +887,7 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( co
if( aSize.Width > 0 && aSize.Height > 0 )
{
- ::avmedia::gstreamer::Window* pWindow = new ::avmedia::gstreamer::Window( mxMgr, *this );
+ ::avmedia::gstreamer::Window* pWindow = new ::avmedia::gstreamer::Window( mxMgr );
xRet = pWindow;
diff --git a/avmedia/source/gstreamer/gstwindow.cxx b/avmedia/source/gstreamer/gstwindow.cxx
index b95c33e..e3c5cc9 100644
--- a/avmedia/source/gstreamer/gstwindow.cxx
+++ b/avmedia/source/gstreamer/gstwindow.cxx
@@ -52,14 +52,12 @@ static ::osl::Mutex& ImplGetOwnStaticMutex()
// Window
-Window::Window( const uno::Reference< lang::XMultiServiceFactory >& rxMgr, Player& rPlayer ) :
+Window::Window( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
mxMgr( rxMgr ),
meZoomLevel( media::ZoomLevel_NOT_AVAILABLE ),
- mrPlayer( rPlayer ),
mnPointerType( awt::SystemPointer::ARROW )
{
::osl::MutexGuard aGuard( ImplGetOwnStaticMutex() );
-
}
Window::~Window()
diff --git a/avmedia/source/gstreamer/gstwindow.hxx b/avmedia/source/gstreamer/gstwindow.hxx
index 60e1d9f..cc784cb 100644
--- a/avmedia/source/gstreamer/gstwindow.hxx
+++ b/avmedia/source/gstreamer/gstwindow.hxx
@@ -39,14 +39,9 @@ class Window : public ::cppu::WeakImplHelper< css::media::XPlayerWindow,
{
public:
- Window( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxMgr,
- Player& rPlayer );
+ Window( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxMgr );
virtual ~Window();
- bool create( const css::uno::Sequence< css::uno::Any >& aArguments );
- void processGraphEvent();
- void updatePointer();
-
// XPlayerWindow
virtual void SAL_CALL update( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL setZoomLevel( css::media::ZoomLevel ZoomLevel ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
@@ -88,10 +83,7 @@ private:
::osl::Mutex maMutex;
css::media::ZoomLevel meZoomLevel;
- Player& mrPlayer;
int mnPointerType;
-
- void ImplLayoutVideoWindow();
};
} // namespace gstreamer
diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx
index 76d81b7..f3d22e7 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -247,8 +247,6 @@ public:
void AddWatch( const OUString& rVName );
bool RemoveSelectedWatch();
void UpdateWatches( bool bBasicStopped = false );
-
- WatchTreeListBox& GetWatchTreeListBox() { return *aTreeListBox.get(); }
};
@@ -363,7 +361,6 @@ public:
void ManageBreakPoints();
void UpdateBreakPoint( const BreakPoint& rBrk );
void BasicAddWatch();
- void BasicRemoveWatch();
bool BasicErrorHdl( StarBASIC* pBasic );
long BasicBreakHdl( StarBASIC* pBasic );
diff --git a/basctl/source/basicide/bastype2.hxx b/basctl/source/basicide/bastype2.hxx
index c0f02b4..d009735 100644
--- a/basctl/source/basicide/bastype2.hxx
+++ b/basctl/source/basicide/bastype2.hxx
@@ -141,19 +141,14 @@ public:
bool operator == (EntryDescriptor const& rDesc) const;
ScriptDocument const& GetDocument() const { return m_aDocument; }
- void SetDocument( const ScriptDocument& rDocument ) { m_aDocument = rDocument; }
LibraryLocation GetLocation() const { return m_eLocation; }
- void SetLocation( LibraryLocation eLocation ) { m_eLocation = eLocation; }
const OUString& GetLibName() const { return m_aLibName; }
- void SetLibName( const OUString& aLibName ) { m_aLibName = aLibName; }
const OUString& GetLibSubName() const { return m_aLibSubName; }
- void SetLibSubName( const OUString& aLibSubName ) { m_aLibSubName = aLibSubName; }
const OUString& GetName() const { return m_aName; }
- void SetName( const OUString& aName ) { m_aName = aName; }
const OUString& GetMethodName() const { return m_aMethodName; }
void SetMethodName( const OUString& aMethodName ) { m_aMethodName = aMethodName; }
diff --git a/basctl/source/basicide/bastype3.hxx b/basctl/source/basicide/bastype3.hxx
index 7565fc4..5974db7 100644
--- a/basctl/source/basicide/bastype3.hxx
+++ b/basctl/source/basicide/bastype3.hxx
@@ -42,7 +42,6 @@ public:
ExtendedEdit( vcl::Window* pParent, IDEResId nRes );
void SetAccHdl( const Link<Accelerator*,void>& rLink ) { aAccHdl = rLink; }
- void SetLoseFocusHdl( const Link<ExtendedEdit*,void>& rLink ) { aLoseFocusHdl = rLink; }
Accelerator& GetAccelerator() { return aAcc; }
};
diff --git a/basctl/source/basicide/iderdll.cxx b/basctl/source/basicide/iderdll.cxx
index 535397b..be971559 100644
--- a/basctl/source/basicide/iderdll.cxx
+++ b/basctl/source/basicide/iderdll.cxx
@@ -151,7 +151,6 @@ ExtraData* Dll::GetExtraData ()
ExtraData::ExtraData () :
pSearchItem(new SvxSearchItem(SID_SEARCH_ITEM)),
- nBasicDialogCount(0),
bChoosingMacro(false),
bShellInCriticalSection(false)
{
diff --git a/basctl/source/basicide/iderdll2.hxx b/basctl/source/basicide/iderdll2.hxx
index e64b6a0..02b8e66 100644
--- a/basctl/source/basicide/iderdll2.hxx
+++ b/basctl/source/basicide/iderdll2.hxx
@@ -44,8 +44,6 @@ private:
OUString aAddLibPath;
OUString aAddLibFilter;
- sal_uInt16 nBasicDialogCount;
-
bool bChoosingMacro;
bool bShellInCriticalSection;
@@ -64,10 +62,6 @@ public:
bool& ChoosingMacro() { return bChoosingMacro; }
bool& ShellInCriticalSection() { return bShellInCriticalSection; }
- sal_uInt16 GetBasicDialogCount() const { return nBasicDialogCount; }
- void IncBasicDialogCount() { nBasicDialogCount++; }
- void DecBasicDialogCount() { nBasicDialogCount--; }
-
SvxSearchItem& GetSearchItem() const { return *pSearchItem; }
void SetSearchItem( const SvxSearchItem& rItem );
diff --git a/basctl/source/basicide/moduldlg.hxx b/basctl/source/basicide/moduldlg.hxx
index 305acbb..c70e8b7 100644
--- a/basctl/source/basicide/moduldlg.hxx
+++ b/basctl/source/basicide/moduldlg.hxx
@@ -141,7 +141,6 @@ public:
void SetDocument( const ScriptDocument& rDocument ) { m_aDocument = rDocument; }
void SetMode (ObjectMode::Mode);
- ObjectMode::Mode GetMode () const { return eMode; }
};
class LibDialog: public ModalDialog
@@ -164,7 +163,6 @@ public:
bool IsReplace() const { return m_pReplaceBox->IsChecked(); }
void EnableReference (bool b) { m_pReferenceBox->Enable(b); }
- void EnableReplace (bool b) { m_pReplaceBox->Enable(b); }
};
class OrganizeDialog : public TabDialog
diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx
index 3949209..eed9977 100644
--- a/basctl/source/inc/basidesh.hxx
+++ b/basctl/source/inc/basidesh.hxx
@@ -162,9 +162,6 @@ public:
OUString const& GetCurLibName() const { return m_aCurLibName; }
boost::shared_ptr<LocalizationMgr> GetCurLocalizationMgr() const { return m_pCurLocalizationMgr; }
- ScrollBar& GetHScrollBar() { return *aHScrollBar.get(); }
- ScrollBar& GetVScrollBar() { return *aVScrollBar.get(); }
- ScrollBarBox& GetScrollBarBox() { return *aScrollBarBox.get(); }
TabBar& GetTabBar() { return *pTabBar; }
WindowTable& GetWindowTable() { return aWindowTable; }
sal_uInt16 GetWindowId (BaseWindow const* pWin) const;
diff --git a/basctl/source/inc/bastypes.hxx b/basctl/source/inc/bastypes.hxx
index 9436792..6b32a2d 100644
--- a/basctl/source/inc/bastypes.hxx
+++ b/basctl/source/inc/bastypes.hxx
@@ -223,11 +223,10 @@ public:
const ScriptDocument&
GetDocument() const { return m_aDocument; }
- void SetDocument( const ScriptDocument& rDocument ) { m_aDocument = rDocument; }
bool IsDocument( const ScriptDocument& rDocument ) const { return rDocument == m_aDocument; }
- const OUString& GetLibName() const { return m_aLibName; }
- void SetLibName( const OUString& aLibName ) { m_aLibName = aLibName; }
- const OUString& GetName() const { return m_aName; }
+ const OUString& GetLibName() const { return m_aLibName; }
+
+ const OUString& GetName() const { return m_aName; }
void SetName( const OUString& aName ) { m_aName = aName; }
virtual void OnNewDocument ();
@@ -268,7 +267,6 @@ private:
};
public:
const ScriptDocument& GetDocument() const { return m_aDocument; }
- const OUString& GetLibName() const { return m_aLibName; }
};
public:
class Item
@@ -282,11 +280,8 @@ public:
public:
Item (ScriptDocument const&, OUString const& rLibName, OUString const& rCurrentName, ItemType eCurrentType);
~Item ();
- public:
- const ScriptDocument& GetDocument() const { return m_aDocument; }
- const OUString& GetLibName() const { return m_aLibName; }
const OUString& GetCurrentName() const { return m_aCurrentName; }
- ItemType GetCurrentType() const { return m_eCurrentType; }
+ ItemType GetCurrentType() const { return m_eCurrentType; }
};
private:
typedef std::unordered_map<Key, Item, Key::Hash> Map;
diff --git a/basctl/source/inc/dlged.hxx b/basctl/source/inc/dlged.hxx
index 0e8ebe6..aec6543 100644
--- a/basctl/source/inc/dlged.hxx
+++ b/basctl/source/inc/dlged.hxx
@@ -177,7 +177,6 @@ public:
bool RemarkDialog();
void SetDialogModelChanged (bool bChanged = true) { bDialogModelChanged = bChanged; }
- bool IsDialogModelChanged () const { return bDialogModelChanged; }
bool IsModified () const;
void ClearModifyFlag();
diff --git a/basctl/source/inc/dlgedobj.hxx b/basctl/source/inc/dlgedobj.hxx
index 5a57650..ddbf7e7 100644
--- a/basctl/source/inc/dlgedobj.hxx
+++ b/basctl/source/inc/dlgedobj.hxx
@@ -180,9 +180,6 @@ public:
void UpdateTabOrderAndGroups();
css::awt::DeviceInfo getDeviceInfo() const;
-
-private:
- void ImplInvalidateDeviceInfo();
};
} // namespace basctl
diff --git a/basctl/source/inc/propbrw.hxx b/basctl/source/inc/propbrw.hxx
index 507ed9c..cec3da8 100644
--- a/basctl/source/inc/propbrw.hxx
+++ b/basctl/source/inc/propbrw.hxx
@@ -78,7 +78,6 @@ public:
// note: changing the Context document to an instance other than the one given in the ctor is not supported
// currently
void Update( const SfxViewShell* pShell );
- SdrView* GetCurView() const { return pView; }
private:
void ImplUpdate( const css::uno::Reference< css::frame::XModel >& _rxContextDocument, SdrView* pView );
diff --git a/basic/qa/cppunit/basictest.hxx b/basic/qa/cppunit/basictest.hxx
index 49bbb29..ad6ac4d 100644
--- a/basic/qa/cppunit/basictest.hxx
+++ b/basic/qa/cppunit/basictest.hxx
@@ -127,15 +127,6 @@ class MacroSnippet
DECL_LINK_TYPED( BasicErrorHdl, StarBASIC *, bool );
- static ErrorDetail GetError()
- {
- ErrorDetail aErr;
- aErr.sErrorText = StarBASIC::GetErrorText();
- aErr.nLine = StarBASIC::GetLine();
- aErr.nCol = StarBASIC::GetCol1();
- return aErr;
- }
-
bool HasError() { return mbError; }
};
diff --git a/codemaker/source/cppumaker/dependencies.hxx b/codemaker/source/cppumaker/dependencies.hxx
index d0c09ae..afd902b 100644
--- a/codemaker/source/cppumaker/dependencies.hxx
+++ b/codemaker/source/cppumaker/dependencies.hxx
@@ -66,18 +66,8 @@ public:
~Dependencies();
- /**
- Add a special dependency (which is not obvious from the entity's data
- available at the type manager).
-
- @param name a UNOIDL entity name
- */
- void add(rtl::OUString const & name) { insert(name); }
-
Map const & getMap() const { return m_map; }
- bool hasVoidDependency() const { return m_voidDependency; }
-
bool hasBooleanDependency() const { return m_booleanDependency; }
bool hasByteDependency() const { return m_byteDependency; }
@@ -89,17 +79,11 @@ public:
bool hasLongDependency() const { return m_longDependency; }
- bool hasUnsignedLongDependency() const { return m_unsignedLongDependency; }
-
bool hasHyperDependency() const { return m_hyperDependency; }
bool hasUnsignedHyperDependency() const
{ return m_unsignedHyperDependency; }
- bool hasFloatDependency() const { return m_floatDependency; }
-
- bool hasDoubleDependency() const { return m_doubleDependency; }
-
bool hasCharDependency() const { return m_charDependency; }
bool hasStringDependency() const { return m_stringDependency; }
diff --git a/codemaker/source/cppumaker/includes.hxx b/codemaker/source/cppumaker/includes.hxx
index 6618553..c28cfb1 100644
--- a/codemaker/source/cppumaker/includes.hxx
+++ b/codemaker/source/cppumaker/includes.hxx
@@ -47,8 +47,6 @@ public:
void addType() { m_includeType = true; }
void addCppuMacrosHxx() { m_includeCppuMacrosHxx = true; }
void addCppuUnotypeHxx() { m_includeCppuUnotypeHxx = true; }
- void addOslDoublecheckedlockingH()
- { m_includeOslDoublecheckedlockingH = true; }
void addOslMutexHxx() { m_includeOslMutexHxx = true; }
void addRtlStrbufHxx() { m_includeRtlStrbufHxx = true; }
void addRtlStringH() { m_includeRtlStringH = true; }
diff --git a/compilerplugins/clang/unusedmethods.cxx b/compilerplugins/clang/unusedmethods.cxx
index c22c1db..2cc7740 100644
--- a/compilerplugins/clang/unusedmethods.cxx
+++ b/compilerplugins/clang/unusedmethods.cxx
@@ -74,30 +74,24 @@ public:
bool VisitVarDecl( const VarDecl* );
};
-/**
- * We need to include the template params when we are building the set
- * of functions we have walked already, because we need to rewalk anything instantiated with different params
- */
-enum class NiceNameIncludeTemplateParams { NO, YES };
-static std::string niceName(const FunctionDecl* functionDecl, NiceNameIncludeTemplateParams eIncludeTemplateParams = NiceNameIncludeTemplateParams::NO)
+static std::string niceName(const FunctionDecl* functionDecl)
{
+ if (functionDecl->getInstantiatedFromMemberFunction())
+ functionDecl = functionDecl->getInstantiatedFromMemberFunction();
+ else if (functionDecl->getClassScopeSpecializationPattern())
+ functionDecl = functionDecl->getClassScopeSpecializationPattern();
+// workaround clang-3.5 issue
+#if __clang_major__ > 3 || ( __clang_major__ == 3 && __clang_minor__ >= 6 )
+ else if (functionDecl->getTemplateInstantiationPattern())
+ functionDecl = functionDecl->getTemplateInstantiationPattern();
+#endif
+
std::string s =
compat::getReturnType(*functionDecl).getCanonicalType().getAsString()
+ " ";
if (isa<CXXMethodDecl>(functionDecl)) {
const CXXRecordDecl* recordDecl = dyn_cast<CXXMethodDecl>(functionDecl)->getParent();
s += recordDecl->getQualifiedNameAsString();
- if (eIncludeTemplateParams == NiceNameIncludeTemplateParams::YES
- && isa<ClassTemplateSpecializationDecl>(recordDecl))
- {
- const ClassTemplateSpecializationDecl* templateDecl = dyn_cast<ClassTemplateSpecializationDecl>(recordDecl);
- s += "<";
- for(size_t i=0; i < templateDecl->getTemplateArgs().size(); i++)
- {
- s += " ," + templateDecl->getTemplateArgs()[i].getAsType().getAsString();
- }
- s += ">";
- }
s += "::";
}
s += functionDecl->getNameAsString() + "(";
@@ -164,7 +158,7 @@ static bool isStandardStuff(const std::string& input)
}
// prevent recursive templates from blowing up the stack
-static std::set<std::string> traversedFunctionSet;
+static std::set<const FunctionDecl*> traversedFunctionSet;
bool UnusedMethods::VisitCallExpr(CallExpr* expr)
{
@@ -182,7 +176,7 @@ bool UnusedMethods::VisitCallExpr(CallExpr* expr)
// if the function is templated. However, if we are inside a template function,
// calling another function on the same template, the same problem occurs.
// Rather than tracking all of that, just traverse anything we have not already traversed.
- if (traversedFunctionSet.insert(niceName(calleeFunctionDecl, NiceNameIncludeTemplateParams::YES)).second)
+ if (traversedFunctionSet.insert(calleeFunctionDecl).second)
TraverseFunctionDecl(calleeFunctionDecl);
logCallToRootMethods(calleeFunctionDecl);
@@ -205,7 +199,7 @@ bool UnusedMethods::VisitCXXConstructExpr(const CXXConstructExpr* expr)
}
// if we see a call to a constructor, it may effectively create a whole new class,
// if the constructor's class is templated.
- if (!traversedFunctionSet.insert(niceName(consDecl)).second)
+ if (!traversedFunctionSet.insert(consDecl).second)
return true;
const CXXRecordDecl* parent = consDecl->getParent();
diff --git a/compilerplugins/clang/unusedmethods.py b/compilerplugins/clang/unusedmethods.py
index f8c5ae2..06adccb 100755
--- a/compilerplugins/clang/unusedmethods.py
+++ b/compilerplugins/clang/unusedmethods.py
@@ -27,7 +27,7 @@ exclusionSet = set([
"void unoidl::detail::SourceProviderScannerData::setSource(const void *,unsigned long)",
"enum connectivity::IParseContext::InternationalKeyCode connectivity::IParseContext::getIntlKeyCode(const class rtl::OString &) const",
"void connectivity::OSQLParser::error(const char *)",
- "void connectivity::OSQLParseNode::insert(unsigned int,class connectivity::OSQLParseNode *)"
+ "void connectivity::OSQLParseNode::insert(unsigned int,class connectivity::OSQLParseNode *)",
# TODO track instantiations of template class constructors
"void comphelper::IEventProcessor::release()",
"void SotMutexHolder::acquire()",
@@ -35,6 +35,7 @@ exclusionSet = set([
# only used by Windows build
"_Bool basegfx::B2ITuple::equalZero() const",
"class basegfx::B2DPolyPolygon basegfx::unotools::UnoPolyPolygon::getPolyPolygonUnsafe() const",
+ "void basegfx::B2IRange::expand(const basegfx::B2ITuple &)",
"void OpenGLContext::requestSingleBufferedRendering()",
"_Bool TabitemValue::isBothAligned() const",
"_Bool TabitemValue::isNotAligned() const",
@@ -57,6 +58,8 @@ exclusionSet = set([
"_Bool IDocumentLinksAdministration::GetData(const class rtl::OUString &,const class rtl::OUString &,class com::sun::star::uno::Any &) const",
"_Bool IDocumentLinksAdministration::SetData(const class rtl::OUString &,const class rtl::OUString &,const class com::sun::star::uno::Any &)",
"_Bool ScImportExport::ImportData(const class rtl::OUString &,const class com::sun::star::uno::Any &)",
+ "void* ScannerManager::GetData()",
+ "void ScannerManager::SetData(void *)",
# instantiated from templates, not sure why it is not being picked up
"class basegfx::B2DPolygon OutputDevice::PixelToLogic(const class basegfx::B2DPolygon &,const class MapMode &) const",
"type-parameter-0-0 * detail::cloner::clone(type-parameter-0-0 *const)",
diff --git a/configmgr/source/nodemap.hxx b/configmgr/source/nodemap.hxx
index a000b30..77c9dd0 100644
--- a/configmgr/source/nodemap.hxx
+++ b/configmgr/source/nodemap.hxx
@@ -54,7 +54,6 @@ class NodeMap
rtl::Reference<Node> &operator[](const OUString &aStr) { clearCache(); return maImpl[aStr]; }
std::pair<iterator,bool> insert(const value_type &vt) { clearCache(); return maImpl.insert(vt); }
- void clear() { maImpl.clear(); clearCache(); }
void erase(const iterator &it) { maImpl.erase(it); clearCache(); }
void erase(const OUString &aStr) { maImpl.erase(aStr); clearCache(); }
diff --git a/configmgr/source/writemodfile.cxx b/configmgr/source/writemodfile.cxx
index dc247e2..3d8cc8b 100644
--- a/configmgr/source/writemodfile.cxx
+++ b/configmgr/source/writemodfile.cxx
@@ -93,6 +93,7 @@ TempFile::~TempFile() {
}
}
+#ifdef WNT
oslFileError TempFile::closeWithoutUnlink() {
flush();
oslFileError e = osl_closeFile(handle);
@@ -100,6 +101,7 @@ oslFileError TempFile::closeWithoutUnlink() {
closed = true;
return e;
}
+#endif
void TempFile::closeAndRename(const OUString &_url) {
oslFileError e = flush();
diff --git a/configmgr/source/writemodfile.hxx b/configmgr/source/writemodfile.hxx
index ffa5e30..d53efe9 100644
--- a/configmgr/source/writemodfile.hxx
+++ b/configmgr/source/writemodfile.hxx
@@ -37,7 +37,9 @@ struct TempFile {
~TempFile();
void closeAndRename(const OUString &url);
oslFileError flush();
+#ifdef WNT
oslFileError closeWithoutUnlink();
+#endif
void writeString(char const *begin, sal_Int32 length);
private:
diff --git a/dbaccess/source/core/api/CacheSet.cxx b/dbaccess/source/core/api/CacheSet.cxx
index ea64ee4..e0ed967 100644
--- a/dbaccess/source/core/api/CacheSet.cxx
+++ b/dbaccess/source/core/api/CacheSet.cxx
@@ -551,12 +551,6 @@ bool SAL_CALL OCacheSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeEx
return m_xDriverSet->absolute(row);
}
-bool SAL_CALL OCacheSet::relative( sal_Int32 rows ) throw(SQLException, RuntimeException)
-{
- m_bInserted = m_bUpdated = m_bDeleted = false;
- return m_xDriverSet->relative(rows);
-}
-
bool SAL_CALL OCacheSet::previous( ) throw(SQLException, RuntimeException)
{
m_bInserted = m_bUpdated = m_bDeleted = false;
diff --git a/dbaccess/source/core/api/CacheSet.hxx b/dbaccess/source/core/api/CacheSet.hxx
index 733858c..0b9d377 100644
--- a/dbaccess/source/core/api/CacheSet.hxx
+++ b/dbaccess/source/core/api/CacheSet.hxx
@@ -109,7 +109,6 @@ namespace dbaccess
virtual bool SAL_CALL last( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
virtual sal_Int32 SAL_CALL getRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
virtual bool SAL_CALL absolute( sal_Int32 row ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
- virtual bool SAL_CALL relative( sal_Int32 rows ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
virtual bool SAL_CALL previous( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL refreshRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
virtual bool SAL_CALL rowUpdated( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx
index 42fc812..b4bfdc4 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -1162,16 +1162,6 @@ bool OKeySet::absolute_checked( sal_Int32 row, bool /* i_bFetchRow */ )
return m_aKeyIter != m_aKeyMap.end() && m_aKeyIter != m_aKeyMap.begin();
}
-bool SAL_CALL OKeySet::relative( sal_Int32 rows ) throw(SQLException, RuntimeException)
-{
- if(!rows)
- {
- invalidateRow();
- return true;
- }
- return absolute(getRow()+rows);
-}
-
bool OKeySet::previous_checked( bool /* i_bFetchRow */ )
{
m_bInserted = m_bUpdated = m_bDeleted = false;
diff --git a/dbaccess/source/core/api/KeySet.hxx b/dbaccess/source/core/api/KeySet.hxx
index 4fae1a6..5a837c5 100644
--- a/dbaccess/source/core/api/KeySet.hxx
+++ b/dbaccess/source/core/api/KeySet.hxx
@@ -194,7 +194,6 @@ namespace dbaccess
virtual bool SAL_CALL last( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL getRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual bool SAL_CALL absolute( sal_Int32 row ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual bool SAL_CALL relative( sal_Int32 rows ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual bool SAL_CALL previous( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
void SAL_CALL ensureRowForData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL refreshRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
diff --git a/dbaccess/source/core/api/StaticSet.cxx b/dbaccess/source/core/api/StaticSet.cxx
index 95d2d2b..202df41 100644
--- a/dbaccess/source/core/api/StaticSet.cxx
+++ b/dbaccess/source/core/api/StaticSet.cxx
@@ -217,15 +217,6 @@ bool SAL_CALL OStaticSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeE
return m_aSetIter != m_aSet.end() && m_aSetIter != m_aSet.begin();
}
-bool SAL_CALL OStaticSet::relative( sal_Int32 rows ) throw(SQLException, RuntimeException)
-{
- if(!rows)
- return true;
-
- sal_Int32 nCurPos = getRow();
- return absolute(nCurPos+rows);
-}
-
bool SAL_CALL OStaticSet::previous( ) throw(SQLException, RuntimeException)
{
m_bInserted = m_bUpdated = m_bDeleted = false;
diff --git a/dbaccess/source/core/api/StaticSet.hxx b/dbaccess/source/core/api/StaticSet.hxx
index c6f5a94..20fef0c 100644
--- a/dbaccess/source/core/api/StaticSet.hxx
+++ b/dbaccess/source/core/api/StaticSet.hxx
@@ -61,7 +61,6 @@ namespace dbaccess
virtual bool SAL_CALL last( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL getRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual bool SAL_CALL absolute( sal_Int32 row ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual bool SAL_CALL relative( sal_Int32 rows ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual bool SAL_CALL previous( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL refreshRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual bool SAL_CALL rowUpdated( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
diff --git a/dbaccess/source/core/api/query.hxx b/dbaccess/source/core/api/query.hxx
index 6204f76..0c14512 100644
--- a/dbaccess/source/core/api/query.hxx
+++ b/dbaccess/source/core/api/query.hxx
@@ -132,7 +132,6 @@ public:
public:
// the caller is responsible for the lifetime!
void setWarningsContainer( ::dbtools::WarningsContainer* _pWarnings ) { m_pWarnings = _pWarnings; }
- ::dbtools::WarningsContainer* getWarningsContainer( ) const { return m_pWarnings; }
// XRename
virtual void SAL_CALL rename( const OUString& newName ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/dbaccess/source/core/inc/ContentHelper.hxx b/dbaccess/source/core/inc/ContentHelper.hxx
index 9165978..da4924b 100644
--- a/dbaccess/source/core/inc/ContentHelper.hxx
+++ b/dbaccess/source/core/inc/ContentHelper.hxx
@@ -99,9 +99,6 @@ namespace dbaccess
::com::sun::star::beans::PropertyValue >& rValues,
const ::com::sun::star::uno::Reference<
::com::sun::star::ucb::XCommandEnvironment >& xEnv );
- com::sun::star::uno::Sequence< com::sun::star::beans::Property >
- getProperties( const com::sun::star::uno::Reference<
- com::sun::star::ucb::XCommandEnvironment > & xEnv );
void impl_rename_throw(const OUString& _sNewName,bool _bNotify = true);
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index 14dea27..99ad41e 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -481,10 +481,6 @@ void SvxNumberFormat::SetIndentAt( const long nIndentAt )
mnIndentAt = nIndentAt;
}
-void SvxNumberFormat::NotifyGraphicArrived()
-{
-}
-
Size SvxNumberFormat::GetGraphicSizeMM100(const Graphic* pGraphic)
{
const MapMode aMapMM100( MAP_100TH_MM );
diff --git a/editeng/source/outliner/outlin2.cxx b/editeng/source/outliner/outlin2.cxx
index 549f645..9001a84 100644
--- a/editeng/source/outliner/outlin2.cxx
+++ b/editeng/source/outliner/outlin2.cxx
@@ -582,11 +582,6 @@ bool Outliner::IsForceAutoColor() const
return pEditEngine->IsForceAutoColor();
}
-void Outliner::StartSpelling(EditView& rEditView, bool bMultipleDoc)
-{
- pEditEngine->StartSpelling(rEditView, bMultipleDoc);
-}
-
bool Outliner::SpellSentence(EditView& rEditView, svx::SpellPortions& rToFill, bool bIsGrammarChecking )
{
return pEditEngine->SpellSentence(rEditView, rToFill, bIsGrammarChecking );
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index 4493f0a..8f5067a 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -660,17 +660,6 @@ void Outliner::FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_In
}
-void Outliner::FieldSelected( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos )
-{
- if ( !aFieldClickedHdl.IsSet() )
- return;
-
- EditFieldInfo aFldInfo( this, rField, nPara, nPos );
- aFldInfo.SetSimpleClick( false );
- aFieldClickedHdl.Call( &aFldInfo );
-}
-
-
OUString Outliner::CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rpTxtColor, Color*& rpFldColor )
{
if ( !aCalcFieldValueHdl.IsSet() )
diff --git a/editeng/source/uno/unoipset.cxx b/editeng/source/uno/unoipset.cxx
index fbece03..8c0fc50 100644
--- a/editeng/source/uno/unoipset.cxx
+++ b/editeng/source/uno/unoipset.cxx
@@ -40,9 +40,9 @@ struct SvxIDPropertyCombine
};
-SvxItemPropertySet::SvxItemPropertySet( const SfxItemPropertyMapEntry* pMap, SfxItemPool& rItemPool, bool bConvertTwips )
+SvxItemPropertySet::SvxItemPropertySet( const SfxItemPropertyMapEntry* pMap, SfxItemPool& rItemPool )
: m_aPropertyMap( pMap ),
- _pMap(pMap), mbConvertTwips(bConvertTwips), mrItemPool( rItemPool )
+ mrItemPool( rItemPool )
{
}
diff --git a/embeddedobj/source/commonembedding/miscobj.cxx b/embeddedobj/source/commonembedding/miscobj.cxx
index 966eb47..f5e4de6 100644
--- a/embeddedobj/source/commonembedding/miscobj.cxx
+++ b/embeddedobj/source/commonembedding/miscobj.cxx
@@ -404,47 +404,7 @@ void SAL_CALL OCommonEmbeddedObject::release()
}
-uno::Sequence< uno::Type > SAL_CALL OCommonEmbeddedObject::getTypes()
- throw( uno::RuntimeException )
-{
- static ::cppu::OTypeCollection* pTypeCollection = NULL;
-
- if ( !pTypeCollection )
- {
- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
- if ( !pTypeCollection )
- {
- if ( m_bIsLink )
- {
- static ::cppu::OTypeCollection aTypeCollection(
- cppu::UnoType<lang::XTypeProvider>::get(),
- cppu::UnoType<embed::XEmbeddedObject>::get(),
- cppu::UnoType<embed::XInplaceObject>::get(),
- cppu::UnoType<embed::XCommonEmbedPersist>::get(),
- cppu::UnoType<container::XChild>::get(),
- cppu::UnoType<embed::XLinkageSupport>::get());
-
- pTypeCollection = &aTypeCollection ;
- }
- else
- {
- static ::cppu::OTypeCollection aTypeCollection(
- cppu::UnoType<lang::XTypeProvider>::get(),
- cppu::UnoType<embed::XEmbeddedObject>::get(),
- cppu::UnoType<embed::XInplaceObject>::get(),
- cppu::UnoType<embed::XCommonEmbedPersist>::get(),
- cppu::UnoType<container::XChild>::get(),
- cppu::UnoType<embed::XEmbedPersist>::get(),
- cppu::UnoType<embed::XEmbedPersist2>::get());
-
- pTypeCollection = &aTypeCollection ;
- }
- }
- }
-
- return pTypeCollection->getTypes() ;
-}
uno::Sequence< sal_Int8 > SAL_CALL OCommonEmbeddedObject::getClassID()
throw ( uno::RuntimeException, std::exception )
diff --git a/embeddedobj/source/commonembedding/specialobject.cxx b/embeddedobj/source/commonembedding/specialobject.cxx
index 39fb7d2..52fcb32 100644
--- a/embeddedobj/source/commonembedding/specialobject.cxx
+++ b/embeddedobj/source/commonembedding/specialobject.cxx
@@ -73,29 +73,6 @@ uno::Any SAL_CALL OSpecialEmbeddedObject::queryInterface( const uno::Type& rType
}
-uno::Sequence< uno::Type > SAL_CALL OSpecialEmbeddedObject::getTypes()
- throw( uno::RuntimeException )
-{
- static ::cppu::OTypeCollection* pTypeCollection = NULL;
-
- if ( !pTypeCollection )
- {
- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
- if ( !pTypeCollection )
- {
- static ::cppu::OTypeCollection aTypeCollection(
- cppu::UnoType<lang::XTypeProvider>::get(),
- cppu::UnoType<embed::XEmbeddedObject>::get(),
- cppu::UnoType<embed::XInplaceObject>::get());
-
- pTypeCollection = &aTypeCollection ;
- }
- }
-
- return pTypeCollection->getTypes() ;
-
-}
-
embed::VisualRepresentation SAL_CALL OSpecialEmbeddedObject::getPreferredVisualRepresentation( sal_Int64 nAspect )
throw ( lang::IllegalArgumentException,
embed::WrongStateException,
diff --git a/embeddedobj/source/inc/commonembobj.hxx b/embeddedobj/source/inc/commonembobj.hxx
index 410850e..c035282 100644
--- a/embeddedobj/source/inc/commonembobj.hxx
+++ b/embeddedobj/source/inc/commonembobj.hxx
@@ -258,11 +258,6 @@ public:
virtual void SAL_CALL release()
throw() SAL_OVERRIDE;
-// XTypeProvider
-
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes()
- throw( ::com::sun::star::uno::RuntimeException ) ;
-
// XEmbeddedObject
virtual void SAL_CALL changeState( sal_Int32 nNewState )
diff --git a/embeddedobj/source/inc/docholder.hxx b/embeddedobj/source/inc/docholder.hxx
index d372a57..dcf196a 100644
--- a/embeddedobj/source/inc/docholder.hxx
+++ b/embeddedobj/source/inc/docholder.hxx
@@ -123,7 +123,6 @@ public:
void SetComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseable >& xDoc, bool bReadOnly );
void ResizeHatchWindow();
- void LockOffice();
void FreeOffice();
void CloseDocument( bool bDeliverOwnership, bool bWaitForClose );
@@ -134,8 +133,6 @@ public:
return m_aContainerName + " - " + m_aDocumentNamePart;
}
- OUString GetContainerName() const { return m_aContainerName; }
-
void SetOutplaceFrameProperties( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aProps )
{ m_aOutplaceFrameProps = aProps; }
diff --git a/embeddedobj/source/inc/oleembobj.hxx b/embeddedobj/source/inc/oleembobj.hxx
index 04ffae9..06d883b 100644
--- a/embeddedobj/source/inc/oleembobj.hxx
+++ b/embeddedobj/source/inc/oleembobj.hxx
@@ -49,38 +49,38 @@ class VerbExecutionController
// the following mutex is allowed to be locked only for variables initialization, so no deadlock can be caused
::osl::Mutex m_aVerbExecutionMutex;
- bool m_bVerbExecutionInProgress;
+ sal_Int32 m_nNotificationLock;
+
#ifdef WNT
+ bool m_bWasEverActive;
+ bool m_bVerbExecutionInProgress;
oslThreadIdentifier m_nVerbExecutionThreadIdentifier;
sal_Bool m_bChangedOnVerbExecution;
#endif
- bool m_bWasEverActive;
- sal_Int32 m_nNotificationLock;
-
public:
VerbExecutionController()
- : m_bVerbExecutionInProgress( false )
+ : m_nNotificationLock( 0 )
#ifdef WNT
+ , m_bWasEverActive( false )
+ , m_bVerbExecutionInProgress( false )
, m_nVerbExecutionThreadIdentifier( 0 )
, m_bChangedOnVerbExecution( sal_False )
#endif
- , m_bWasEverActive( false )
- , m_nNotificationLock( 0 )
{}
+
#ifdef WNT
void StartControlExecution();
sal_Bool EndControlExecution_WasModified();
void ModificationNotificationIsDone();
-#endif
- void LockNotification();
- void UnlockNotification();
-
// no need to lock anything to check the value of the numeric members
bool CanDoNotification() { return ( !m_bVerbExecutionInProgress && !m_bWasEverActive && !m_nNotificationLock ); }
// ... or to change it
void ObjectIsActive() { m_bWasEverActive = true; }
+#endif
+ void LockNotification();
+ void UnlockNotification();
};
class VerbExecutionControllerGuard
@@ -220,7 +220,6 @@ protected:
const ::com::sun::star::uno::Sequence< ::com::sun::star::embed::VerbDescriptor >& aVerbList );
#endif
- void CloseComponent();
void Dispose();
void SwitchOwnPersistence(
@@ -269,14 +268,10 @@ protected:
void CreateOleComponent_Impl( OleComponent* pOleComponent = NULL );
void CreateOleComponentAndLoad_Impl( OleComponent* pOleComponent = NULL );
void CreateOleComponentFromClipboard_Impl( OleComponent* pOleComponent = NULL );
-#endif
- void SetObjectIsLink_Impl( bool bIsLink ) { m_bIsLink = bIsLink; }
-
-#ifdef WNT
OUString CreateTempURLEmpty_Impl();
OUString GetTempURL_Impl();
+ void SetObjectIsLink_Impl( bool bIsLink ) { m_bIsLink = bIsLink; }
#endif
- OUString GetContainerName_Impl() { return m_aContainerName; }
// the following 4 methods are related to switch to wrapping mode
void MoveListeners();
diff --git a/embeddedobj/source/inc/specialobject.hxx b/embeddedobj/source/inc/specialobject.hxx
index fa34f17..0d4895a 100644
--- a/embeddedobj/source/inc/specialobject.hxx
+++ b/embeddedobj/source/inc/specialobject.hxx
@@ -37,10 +37,6 @@ public:
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType )
throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ;
- // XTypeProvider
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes()
- throw( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE ;
-
// XVisualObject
virtual ::com::sun::star::embed::VisualRepresentation SAL_CALL getPreferredVisualRepresentation( ::sal_Int64 nAspect )
throw ( ::com::sun::star::lang::IllegalArgumentException,
diff --git a/extensions/source/abpilot/abspilot.hxx b/extensions/source/abpilot/abspilot.hxx
index 515c5cf..28deb98 100644
--- a/extensions/source/abpilot/abspilot.hxx
+++ b/extensions/source/abpilot/abspilot.hxx
@@ -117,11 +117,6 @@ namespace abp
return ( AST_LDAP != _eType ) && ( AST_KAB != _eType );
}
- inline bool needTableSelection() const
- {
- return needTableSelection( m_aSettings.eType );
- }
-
void implCleanup();
void implCommitAll();
diff --git a/extensions/source/bibliography/bibcont.hxx b/extensions/source/bibliography/bibcont.hxx
index cb1d07e..580e722 100644
--- a/extensions/source/bibliography/bibcont.hxx
+++ b/extensions/source/bibliography/bibcont.hxx
@@ -89,9 +89,6 @@ class BibBookContainer: public BibSplitWindow
virtual ~BibBookContainer();
virtual void dispose() SAL_OVERRIDE;
- inline BibWindow* GetTopWin() {return pTopWin;}
- inline BibWindow* GetBottomWin() {return pBottomWin;}
-
// !BibShortCutHandler is also always a Window!
void createTopFrame( BibShortCutHandler* pWin );
diff --git a/extensions/source/bibliography/datman.hxx b/extensions/source/bibliography/datman.hxx
index 8d6e1a8..fb5db53 100644
--- a/extensions/source/bibliography/datman.hxx
+++ b/extensions/source/bibliography/datman.hxx
@@ -111,8 +111,6 @@ protected:
void SetMeAsUidListener();
void RemoveMeAsUidListener();
- void UpdateAddressbookCursor(const OUString& aSourceName);
-
::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >
updateGridModel(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm > & xDbForm);
static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >
diff --git a/extensions/source/dbpilots/gridwizard.hxx b/extensions/source/dbpilots/gridwizard.hxx
index 871bca8..1cbb7ebd2 100644
--- a/extensions/source/dbpilots/gridwizard.hxx
+++ b/extensions/source/dbpilots/gridwizard.hxx
@@ -100,9 +100,6 @@ namespace dbp
DECL_LINK(OnEntryDoubleClicked, ListBox*);
void implCheckButtons();
- void implApplySettings();
-
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > implGetColumns(bool _bShowError = true);
};
diff --git a/extensions/source/propctrlr/browserview.hxx b/extensions/source/propctrlr/browserview.hxx
index 60f0667..0209b32 100644
--- a/extensions/source/propctrlr/browserview.hxx
+++ b/extensions/source/propctrlr/browserview.hxx
@@ -56,7 +56,6 @@ namespace pcr
void activatePage(sal_uInt16 _nPage);
void setPageActivationHandler(const Link<>& _rHdl) { m_aPageActivationHandler = _rHdl; }
- Link<> getPageActivationHandler() const { return m_aPageActivationHandler; }
::com::sun::star::awt::Size getMinimumSize();
diff --git a/extensions/source/propctrlr/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx
index ea2d2aa..b3b959c 100644
--- a/extensions/source/propctrlr/formmetadata.cxx
+++ b/extensions/source/propctrlr/formmetadata.cxx
@@ -366,13 +366,6 @@ namespace pcr
}
- OUString OPropertyInfoService::getPropertyName( sal_Int32 _nPropId )
- {
- const OPropertyInfoImpl* pInfo = getPropertyInfo(_nPropId);
- return pInfo ? pInfo->sName : OUString();
- }
-
-
OUString OPropertyInfoService::getPropertyTranslation(sal_Int32 _nId) const
{
const OPropertyInfoImpl* pInfo = getPropertyInfo(_nId);
diff --git a/extensions/source/propctrlr/formmetadata.hxx b/extensions/source/propctrlr/formmetadata.hxx
index 7dad5c5..20c4fbd 100644
--- a/extensions/source/propctrlr/formmetadata.hxx
+++ b/extensions/source/propctrlr/formmetadata.hxx
@@ -51,7 +51,6 @@ namespace pcr
virtual sal_Int16 getPropertyPos(sal_Int32 _nId) const SAL_OVERRIDE;
virtual sal_uInt32 getPropertyUIFlags(sal_Int32 _nId) const SAL_OVERRIDE;
virtual ::std::vector< OUString > getPropertyEnumRepresentations(sal_Int32 _nId) const SAL_OVERRIDE;
- virtual OUString getPropertyName( sal_Int32 _nPropId ) SAL_OVERRIDE;
bool isComposeable( const OUString& _rPropertyName ) const;
diff --git a/extensions/source/propctrlr/propertyeditor.hxx b/extensions/source/propctrlr/propertyeditor.hxx
index 6fe279b..e202095 100644
--- a/extensions/source/propctrlr/propertyeditor.hxx
+++ b/extensions/source/propctrlr/propertyeditor.hxx
@@ -94,7 +94,6 @@ namespace pcr
void ClearAll();
void SetPropertyValue(const OUString& _rEntryName, const ::com::sun::star::uno::Any& _rValue, bool _bUnknownValue );
- ::com::sun::star::uno::Any GetPropertyValue(const OUString& rEntryName ) const;
sal_uInt16 GetPropertyPos(const OUString& rEntryName ) const;
::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >
GetPropertyControl( const OUString& rEntryName );
@@ -108,7 +107,6 @@ namespace pcr
void ChangeEntry( const OLineDescriptor& );
void setPageActivationHandler(const Link<>& _rHdl) { m_aPageActivationHandler = _rHdl; }
- Link<> getPageActivationHandler() const { return m_aPageActivationHandler; }
// #95343# -------------------------------
sal_Int32 getMinimumWidth();
diff --git a/extensions/source/propctrlr/propertyinfo.hxx b/extensions/source/propctrlr/propertyinfo.hxx
index b677daf..dc5dba4 100644
--- a/extensions/source/propctrlr/propertyinfo.hxx
+++ b/extensions/source/propctrlr/propertyinfo.hxx
@@ -43,9 +43,6 @@ namespace pcr
virtual sal_uInt32 getPropertyUIFlags(sal_Int32 _nId) const = 0;
virtual ::std::vector< OUString > getPropertyEnumRepresentations(sal_Int32 _nId) const = 0;
- // this is only temporary, until the UNOization of the property browser is completed
- virtual OUString getPropertyName( sal_Int32 _nPropId ) = 0;
-
virtual ~IPropertyInfoService() { }
};
diff --git a/extensions/source/scanner/scanner.hxx b/extensions/source/scanner/scanner.hxx
index 2a77acc..e7384e8 100644
--- a/extensions/source/scanner/scanner.hxx
+++ b/extensions/source/scanner/scanner.hxx
@@ -81,12 +81,9 @@ public:
static OUString getImplementationName_Static() throw();
static Sequence< OUString > getSupportedServiceNames_Static() throw();
- void Lock() { maProtector.acquire(); }
- void Unlock() { maProtector.release(); }
-
void* GetData() const { return mpData; }
void SetData( void* pData ) { ReleaseData(); mpData = pData; }
-};
+ };
Reference< XInterface > SAL_CALL ScannerManager_CreateInstance( const Reference< com::sun::star::lang::XMultiServiceFactory >& rxFactory ) throw( Exception );
diff --git a/include/basebmp/colormisc.hxx b/include/basebmp/colormisc.hxx
index 233c318..dc269a0 100644
--- a/include/basebmp/colormisc.hxx
+++ b/include/basebmp/colormisc.hxx
@@ -109,9 +109,6 @@ template< bool polarity > struct ColorBlendFunctor32
template<> struct ColorTraits< Color >
{
- /// @return number of color channels
- static int numChannels() { return 3; }
-
/// Type of a color component (i.e. the type of an individual channel)
typedef sal_uInt8 component_type;
@@ -167,15 +164,6 @@ struct NumericTraits<basebmp::Color>
typedef VigraTrueType isSigned;
typedef VigraTrueType isOrdered;
typedef VigraFalseType isComplex;
-
- static Type zero() { return Type(); }
- static Type one() { return Type(0x01010101); }
- static Type nonZero() { return Type(0x01010101); }
-
- static Promote toPromote(const Type& v) { return v; }
- static RealPromote toRealPromote(const Type& v) { return v; }
- static Type fromPromote(const Promote& v) { return v; }
- static Type fromRealPromote(const RealPromote& v) { return v; }
};
} // namespace vigra
diff --git a/include/basegfx/pixel/bpixel.hxx b/include/basegfx/pixel/bpixel.hxx
index fda6a79..f42e757 100644
--- a/include/basegfx/pixel/bpixel.hxx
+++ b/include/basegfx/pixel/bpixel.hxx
@@ -103,9 +103,6 @@ namespace basegfx
void setOpacity(sal_uInt8 nNew) { maPixelUnion.maRGBO.mnO = nNew; }
// comparators
- bool isInvisible() const { return (0 == maPixelUnion.maRGBO.mnO); }
- bool isVisible() const { return (0 != maPixelUnion.maRGBO.mnO); }
-
bool operator==( const BPixel& rPixel ) const
{
return (rPixel.maPixelUnion.maCombinedRGBO.mnValue == maPixelUnion.maCombinedRGBO.mnValue);
diff --git a/include/basegfx/point/b3dpoint.hxx b/include/basegfx/point/b3dpoint.hxx
index ef5c643..272bff9 100644
--- a/include/basegfx/point/b3dpoint.hxx
+++ b/include/basegfx/point/b3dpoint.hxx
@@ -120,11 +120,6 @@ namespace basegfx
contrast to B3DVector, applied.
*/
B3DPoint& operator*=( const ::basegfx::B3DHomMatrix& rMat );
-
- static const B3DPoint& getEmptyPoint()
- {
- return static_cast<const B3DPoint&>( ::basegfx::B3DTuple::getEmptyTuple() );
- }
};
// external operators
diff --git a/include/basegfx/range/basicbox.hxx b/include/basegfx/range/basicbox.hxx
index 28667d3..c3d87e0 100644
--- a/include/basegfx/range/basicbox.hxx
+++ b/include/basegfx/range/basicbox.hxx
@@ -48,18 +48,6 @@ namespace basegfx
return mnMinimum >= mnMaximum;
}
- double getCenter() const
- {
- if(isEmpty())
- {
- return 0.0;
- }
- else
- {
- return ((mnMaximum + mnMinimum - 1.0) / 2.0);
- }
- }
-
using Base::isInside;
bool isInside(sal_Int32 nValue) const
@@ -75,49 +63,6 @@ namespace basegfx
}
using Base::overlaps;
-
- bool overlaps(const BasicBox& rBox) const
- {
- if(isEmpty())
- {
- return false;
- }
- else
- {
- if(rBox.isEmpty())
- {
- return false;
- }
- else
- {
- return !((rBox.mnMaximum <= mnMinimum) || (rBox.mnMinimum >= mnMaximum));
- }
- }
- }
-
- void grow(sal_Int32 nValue)
- {
- if(!isEmpty())
- {
- bool bLessThanZero(nValue < 0);
-
- if(nValue > 0 || bLessThanZero)
- {
- mnMinimum -= nValue;
- mnMaximum += nValue;
-
- if(bLessThanZero)
- {
- // test if range did collapse
- if(mnMinimum > mnMaximum)
- {
- // if yes, collapse to center
- mnMinimum = mnMaximum = ((mnMaximum + mnMinimum - 1) / 2);
- }
- }
- }
- }
- }
};
} // end of namespace basegfx
diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx
index bd07c4d..e0fce6a 100644
--- a/include/editeng/numitem.hxx
+++ b/include/editeng/numitem.hxx
@@ -140,7 +140,6 @@ private:
OUString sCharStyleName; // Character Style
- virtual void NotifyGraphicArrived();
public:
explicit SvxNumberFormat( sal_Int16 nNumberingType,
SvxNumPositionAndSpaceMode ePositionAndSpaceMode = LABEL_WIDTH_AND_POSITION );
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index 5921122..900df4b 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -733,8 +733,6 @@ public:
sal_Int16 GetDepth( sal_Int32 nPara ) const;
void SetDepth( Paragraph* pParagraph, sal_Int16 nNewDepth );
- static bool IsVisible( Paragraph* pPara ) { return pPara->IsVisible(); }
-
void EnableUndo( bool bEnable );
bool IsUndoEnabled() const;
void UndoActionStart( sal_uInt16 nId );
@@ -894,7 +892,6 @@ public:
void RemoveFields( bool bKeepFieldText, TypeId aType = NULL );
void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos );
- void FieldSelected( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos );
virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rTxtColor, Color*& rFldColor );
void SetSpeller( ::com::sun::star::uno::Reference<
@@ -927,8 +924,8 @@ public:
void SetRefDevice( OutputDevice* pRefDev );
OutputDevice* GetRefDevice() const;
- sal_uLong GetTextHeight() const;
- sal_uLong GetTextHeight( sal_Int32 nParagraph ) const;
+ sal_uLong GetTextHeight() const;
+ sal_uLong GetTextHeight( sal_Int32 nParagraph ) const;
Point GetDocPosTopLeft( sal_Int32 nParagraph );
Point GetDocPos( const Point& rPaperPos ) const;
bool IsTextPos( const Point& rPaperPos, sal_uInt16 nBorder = 0 );
@@ -943,11 +940,10 @@ public:
const EditEngine& GetEditEngine() const;
// this is needed for StarOffice Api
- void SetLevelDependendStyleSheet( sal_Int32 nPara );
+ void SetLevelDependendStyleSheet( sal_Int32 nPara );
- sal_uInt16 GetOutlinerMode() const { return nOutlinerMode & OUTLINERMODE_USERMASK; }
+ sal_uInt16 GetOutlinerMode() const { return nOutlinerMode & OUTLINERMODE_USERMASK; }
- void StartSpelling(EditView& rEditView, bool bMultipleDoc);
// spell and return a sentence
bool SpellSentence(EditView& rEditView, svx::SpellPortions& rToFill, bool bIsGrammarChecking );
// put spell position to start of current sentence
diff --git a/include/editeng/unoipset.hxx b/include/editeng/unoipset.hxx
index 43ecb9d..3bea379 100644
--- a/include/editeng/unoipset.hxx
+++ b/include/editeng/unoipset.hxx
@@ -37,13 +37,11 @@ class EDITENG_DLLPUBLIC SvxItemPropertySet
{
SfxItemPropertyMap m_aPropertyMap;
mutable com::sun::star::uno::Reference<com::sun::star::beans::XPropertySetInfo> m_xInfo;
- const SfxItemPropertyMapEntry* _pMap;
::std::vector< SvxIDPropertyCombine* > aCombineList;
- bool mbConvertTwips;
SfxItemPool& mrItemPool;
public:
- SvxItemPropertySet( const SfxItemPropertyMapEntry *pMap, SfxItemPool& rPool, bool bConvertTwips = false );
+ SvxItemPropertySet( const SfxItemPropertyMapEntry *pMap, SfxItemPool& rPool );
~SvxItemPropertySet();
// Methods, which work directly with the ItemSet
@@ -62,8 +60,6 @@ public:
com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > getPropertySetInfo() const;
const SfxItemPropertyMap& getPropertyMap() const { return m_aPropertyMap;}
const SfxItemPropertySimpleEntry* getPropertyMapEntry(const OUString &rName) const;
-
- static com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > getPropertySetInfo( const SfxItemPropertyMapEntry* pMap );
};
/** converts the given any with a metric to 100th/mm if needed */
diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx
index 585937d..79aa6fe 100644
--- a/sw/inc/numrule.hxx
+++ b/sw/inc/numrule.hxx
@@ -53,7 +53,6 @@ class SW_DLLPUBLIC SwNumFormat : public SvxNumberFormat, public SwClient
//For i120928,record the cp info of graphic within bullet
sal_Unicode cGrfBulletCP;
SAL_DLLPRIVATE void UpdateNumNodes( SwDoc* pDoc );
- SAL_DLLPRIVATE virtual void NotifyGraphicArrived() SAL_OVERRIDE;
using SvxNumberFormat::operator ==;
using SvxNumberFormat::operator !=;
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index 0a22fc1..3292de9 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -224,12 +224,6 @@ SwNumFormat::~SwNumFormat()
delete pVertOrient;
}
-void SwNumFormat::NotifyGraphicArrived()
-{
- if( GetCharFormat() )
- UpdateNumNodes( GetCharFormat()->GetDoc() );
-}
-
// #i22362#
bool SwNumFormat::IsEnumeration() const
{
More information about the Libreoffice-commits
mailing list