[Libreoffice-commits] core.git: compilerplugins/clang connectivity/source dbaccess/source desktop/source editeng/source extensions/source filter/source i18npool/inc idl/inc idl/source include/connectivity include/editeng include/filter include/linguistic include/oox include/sfx2 include/svl include/svtools include/svx include/unotools include/vcl sd/source sfx2/source svtools/source svx/source sw/inc sw/qa sw/source unotools/source vcl/inc vcl/source vcl/unx writerperfect/inc
Noel Grandin
noel at peralex.com
Tue Oct 6 01:18:02 PDT 2015
compilerplugins/clang/unusedmethods.cxx | 145 +++++++++++---------
compilerplugins/clang/unusedmethods.py | 38 ++++-
connectivity/source/commontools/DateConversion.cxx | 1
dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx | 5
dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx | 1
desktop/source/deployment/gui/dp_gui_extlistbox.cxx | 65 --------
desktop/source/deployment/gui/dp_gui_extlistbox.hxx | 39 -----
editeng/source/outliner/overflowingtxt.cxx | 5
extensions/source/propctrlr/pcrcommon.hxx | 2
filter/source/msfilter/util.cxx | 126 -----------------
filter/source/svg/gfxtypes.hxx | 2
i18npool/inc/breakiteratorImpl.hxx | 3
i18npool/inc/defaultnumberingprovider.hxx | 3
i18npool/inc/localedata.hxx | 1
idl/inc/bastype.hxx | 3
idl/source/objects/bastype.cxx | 32 ----
include/connectivity/dbconversion.hxx | 4
include/editeng/AccessibleParaManager.hxx | 9 -
include/editeng/editstat.hxx | 8 -
include/editeng/itemtype.hxx | 7
include/editeng/overflowingtxt.hxx | 4
include/filter/msfilter/util.hxx | 9 -
include/linguistic/misc.hxx | 1
include/oox/crypto/CryptTools.hxx | 3
include/oox/drawingml/chart/modelbase.hxx | 2
include/oox/helper/binaryinputstream.hxx | 39 -----
include/sfx2/StylePreviewRenderer.hxx | 5
include/sfx2/thumbnailview.hxx | 2
include/svl/urlbmk.hxx | 5
include/svtools/accessibilityoptions.hxx | 3
include/svtools/extensionlistbox.hxx | 38 -----
include/svtools/grfmgr.hxx | 1
include/svtools/headbar.hxx | 1
include/svtools/htmlcfg.hxx | 3
include/svtools/optionsdrawinglayer.hxx | 3
include/svx/fmtools.hxx | 1
include/svx/framelink.hxx | 38 -----
include/svx/ofaitem.hxx | 4
include/svx/svdmodel.hxx | 3
include/svx/svdotext.hxx | 2
include/svx/svdtrans.hxx | 2
include/svx/textchainflow.hxx | 2
include/unotools/fontoptions.hxx | 5
include/vcl/graphicfilter.hxx | 1
include/vcl/layout.hxx | 3
include/vcl/ppdparser.hxx | 21 --
include/vcl/prgsbar.hxx | 1
include/vcl/printerinfomanager.hxx | 3
include/vcl/window.hxx | 3
sd/source/ui/inc/OutlineView.hxx | 10 -
sfx2/source/control/thumbnailview.cxx | 6
svtools/source/config/accessibilityoptions.cxx | 54 -------
svtools/source/config/htmlcfg.cxx | 12 -
svtools/source/config/optionsdrawinglayer.cxx | 50 ------
svtools/source/graphic/grfmgr.cxx | 9 -
svx/source/form/fmtools.cxx | 6
svx/source/svdraw/svdconv.hxx | 6
svx/source/svdraw/svdmodel.cxx | 6
svx/source/svdraw/svdotext.cxx | 5
svx/source/svdraw/svdtrans.cxx | 8 -
svx/source/svdraw/textchainflow.cxx | 7
sw/inc/swbaslnk.hxx | 9 -
sw/inc/swtypes.hxx | 3
sw/qa/extras/inc/swmodeltestbase.hxx | 4
sw/source/core/unocore/unotbl.cxx | 1
sw/source/filter/html/svxcss1.hxx | 16 --
sw/source/filter/html/wrthtml.hxx | 6
sw/source/filter/ww8/WW8Sttbf.hxx | 20 --
sw/source/filter/ww8/docxattributeoutput.cxx | 17 --
sw/source/filter/ww8/docxattributeoutput.hxx | 1
sw/source/filter/ww8/wrtww8.cxx | 11 -
sw/source/filter/ww8/wrtww8.hxx | 4
unotools/source/config/fontoptions.cxx | 17 --
vcl/inc/idlemgr.hxx | 3
vcl/inc/unx/gtk/gtkframe.hxx | 3
vcl/inc/unx/i18n_status.hxx | 3
vcl/inc/unx/saldisp.hxx | 1
vcl/inc/unx/salunxtime.h | 17 --
vcl/source/app/svdata.cxx | 20 --
vcl/source/window/layout.cxx | 8 -
vcl/unx/generic/app/i18n_status.cxx | 5
vcl/unx/gtk/window/gtksalframe.cxx | 22 ---
writerperfect/inc/ImportFilter.hxx | 5
83 files changed, 134 insertions(+), 948 deletions(-)
New commits:
commit 7e776c0027c19f1bb8e64dd68d3fd9ded0b5d896
Author: Noel Grandin <noel at peralex.com>
Date: Fri Oct 2 08:37:23 2015 +0200
loplugin:unusedmethods
Change-Id: I150baadc442e57ee604563bc52965daa9d2e41af
diff --git a/compilerplugins/clang/unusedmethods.cxx b/compilerplugins/clang/unusedmethods.cxx
index 31ff68d..e5fab5b 100644
--- a/compilerplugins/clang/unusedmethods.cxx
+++ b/compilerplugins/clang/unusedmethods.cxx
@@ -19,7 +19,7 @@
Dump a list of calls to methods, and a list of method definitions.
Then we will post-process the 2 lists and find the set of unused methods.
-Be warned that it produces around 2.4G of log file.
+Be warned that it produces around 4G of log file.
The process goes something like this:
$ make check
@@ -62,6 +62,11 @@ static std::set<MyFuncInfo> callSet;
static std::set<MyFuncInfo> definitionSet;
+static bool startswith(const std::string& s, const std::string& prefix)
+{
+ return s.rfind(prefix,0) == 0;
+}
+
class UnusedMethods:
public RecursiveASTVisitor<UnusedMethods>, public loplugin::Plugin
{
@@ -78,21 +83,29 @@ public:
for (const MyFuncInfo & s : callSet)
output += "call:\t" + s.returnType + "\t" + s.nameAndParams + "\n";
for (const MyFuncInfo & s : definitionSet)
- output += "definition:\t" + s.returnType + "\t" + s.nameAndParams + "\t" + s.sourceLocation + "\n";
+ {
+ //treat all UNO interfaces as having been called, since they are part of our external ABI
+ if (!startswith(s.nameAndParams, "com::sun::star::"))
+ output += "definition:\t" + s.returnType + "\t" + s.nameAndParams + "\t" + s.sourceLocation + "\n";
+ }
ofstream myfile;
myfile.open( SRCDIR "/unusedmethods.log", ios::app | ios::out);
myfile << output;
myfile.close();
}
+ bool shouldVisitTemplateInstantiations () const { return true; }
+
bool VisitCallExpr(CallExpr* );
bool VisitFunctionDecl( const FunctionDecl* decl );
bool VisitDeclRefExpr( const DeclRefExpr* );
bool VisitCXXConstructExpr( const CXXConstructExpr* );
bool VisitVarDecl( const VarDecl* );
+ bool VisitCXXRecordDecl( CXXRecordDecl* );
private:
void logCallToRootMethods(const FunctionDecl* functionDecl);
MyFuncInfo niceName(const FunctionDecl* functionDecl);
+ std::string fullyQualifiedName(const FunctionDecl* functionDecl);
};
MyFuncInfo UnusedMethods::niceName(const FunctionDecl* functionDecl)
@@ -136,10 +149,36 @@ MyFuncInfo UnusedMethods::niceName(const FunctionDecl* functionDecl)
return aInfo;
}
+std::string UnusedMethods::fullyQualifiedName(const FunctionDecl* functionDecl)
+{
+ std::string ret = compat::getReturnType(*functionDecl).getCanonicalType().getAsString();
+ ret += " ";
+ if (isa<CXXMethodDecl>(functionDecl)) {
+ const CXXRecordDecl* recordDecl = dyn_cast<CXXMethodDecl>(functionDecl)->getParent();
+ ret += recordDecl->getQualifiedNameAsString();
+ ret += "::";
+ }
+ ret += functionDecl->getNameAsString() + "(";
+ bool bFirst = true;
+ for (const ParmVarDecl *pParmVarDecl : functionDecl->params()) {
+ if (bFirst)
+ bFirst = false;
+ else
+ ret += ",";
+ ret += pParmVarDecl->getType().getCanonicalType().getAsString();
+ }
+ ret += ")";
+ if (isa<CXXMethodDecl>(functionDecl) && dyn_cast<CXXMethodDecl>(functionDecl)->isConst()) {
+ ret += " const";
+ }
+
+ return ret;
+}
+
void UnusedMethods::logCallToRootMethods(const FunctionDecl* functionDecl)
{
functionDecl = functionDecl->getCanonicalDecl();
- bool bPrinted = false;
+ bool bCalledSuperMethod = false;
if (isa<CXXMethodDecl>(functionDecl)) {
// For virtual/overriding methods, we need to pretend we called the root method(s),
// so that they get marked as used.
@@ -148,50 +187,24 @@ void UnusedMethods::logCallToRootMethods(const FunctionDecl* functionDecl)
it != methodDecl->end_overridden_methods(); ++it)
{
logCallToRootMethods(*it);
- bPrinted = true;
+ bCalledSuperMethod = true;
}
}
- if (!bPrinted)
+ if (!bCalledSuperMethod)
{
+ while (functionDecl->getTemplateInstantiationPattern())
+ functionDecl = functionDecl->getTemplateInstantiationPattern();
callSet.insert(niceName(functionDecl));
}
}
-static bool startsWith(const std::string& s, const char* other)
-{
- return s.compare(0, strlen(other), other) == 0;
-}
-
-static bool isStandardStuff(const std::string& input)
-{
- std::string s = input;
- if (startsWith(s,"class "))
- s = s.substr(6);
- else if (startsWith(s,"struct "))
- s = s.substr(7);
- // ignore UNO interface definitions, cannot change those
- return startsWith(s, "com::sun::star::")
- // ignore stuff in the C++ stdlib and boost
- || startsWith(s, "std::") || startsWith(s, "boost::") || startsWith(s, "class boost::") || startsWith(s, "__gnu_debug::")
- // external library
- || startsWith(s, "mdds::")
- // can't change our rtl layer
- || startsWith(s, "rtl::")
- // ignore anonymous namespace stuff, it is compilation-unit-local and the compiler will detect any
- // unused code there
- || startsWith(s, "(anonymous namespace)::");
-}
-
// prevent recursive templates from blowing up the stack
-static std::set<const FunctionDecl*> traversedFunctionSet;
+static std::set<std::string> traversedFunctionSet;
bool UnusedMethods::VisitCallExpr(CallExpr* expr)
{
- // I don't use the normal ignoreLocation() here, because I __want__ to include files that are
- // compiled in the $WORKDIR since they may refer to normal code
- SourceLocation expansionLoc = compiler.getSourceManager().getExpansionLoc( expr->getLocStart() );
- if( compiler.getSourceManager().isInSystemHeader( expansionLoc ))
- return true;
+ // Note that I don't ignore ANYTHING here, because I want to get calls to my code that result
+ // from template instantiation deep inside the STL and other external code
FunctionDecl* calleeFunctionDecl = expr->getDirectCallee();
if (calleeFunctionDecl == nullptr) {
@@ -229,7 +242,7 @@ gotfunc:
// 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(calleeFunctionDecl).second)
+ if (traversedFunctionSet.insert(fullyQualifiedName(calleeFunctionDecl)).second)
TraverseFunctionDecl(calleeFunctionDecl);
logCallToRootMethods(calleeFunctionDecl);
@@ -238,12 +251,6 @@ gotfunc:
bool UnusedMethods::VisitCXXConstructExpr(const CXXConstructExpr* expr)
{
- // I don't use the normal ignoreLocation() here, because I __want__ to include files that are
- // compiled in the $WORKDIR since they may refer to normal code
- SourceLocation expansionLoc = compiler.getSourceManager().getExpansionLoc( expr->getLocStart() );
- if( compiler.getSourceManager().isInSystemHeader( expansionLoc ))
- return true;
-
const CXXConstructorDecl *consDecl = expr->getConstructor();
consDecl = consDecl->getCanonicalDecl();
if (consDecl->getTemplatedKind() == FunctionDecl::TemplatedKind::TK_NonTemplate
@@ -252,7 +259,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(consDecl).second)
+ if (!traversedFunctionSet.insert(fullyQualifiedName(consDecl)).second)
return true;
const CXXRecordDecl* parent = consDecl->getParent();
@@ -266,10 +273,6 @@ bool UnusedMethods::VisitCXXConstructExpr(const CXXConstructExpr* expr)
bool UnusedMethods::VisitFunctionDecl( const FunctionDecl* functionDecl )
{
- if (ignoreLocation(functionDecl)) {
- return true;
- }
-
functionDecl = functionDecl->getCanonicalDecl();
const CXXMethodDecl* methodDecl = dyn_cast_or_null<CXXMethodDecl>(functionDecl);
@@ -282,9 +285,6 @@ bool UnusedMethods::VisitFunctionDecl( const FunctionDecl* functionDecl )
functionDecl->getCanonicalDecl()->getNameInfo().getLoc()))) {
return true;
}
- if (methodDecl && isStandardStuff(methodDecl->getParent()->getQualifiedNameAsString())) {
- return true;
- }
if (isa<CXXDestructorDecl>(functionDecl)) {
return true;
}
@@ -295,19 +295,14 @@ bool UnusedMethods::VisitFunctionDecl( const FunctionDecl* functionDecl )
return true;
}
- definitionSet.insert(niceName(functionDecl));
+ if( !ignoreLocation( functionDecl ))
+ definitionSet.insert(niceName(functionDecl));
return true;
}
// this catches places that take the address of a method
bool UnusedMethods::VisitDeclRefExpr( const DeclRefExpr* declRefExpr )
{
- // I don't use the normal ignoreLocation() here, because I __want__ to include files that are
- // compiled in the $WORKDIR since they may refer to normal code
- SourceLocation expansionLoc = compiler.getSourceManager().getExpansionLoc( declRefExpr->getLocStart() );
- if( compiler.getSourceManager().isInSystemHeader( expansionLoc ))
- return true;
-
const Decl* functionDecl = declRefExpr->getDecl();
if (!isa<FunctionDecl>(functionDecl)) {
return true;
@@ -320,11 +315,6 @@ bool UnusedMethods::VisitDeclRefExpr( const DeclRefExpr* declRefExpr )
bool UnusedMethods::VisitVarDecl( const VarDecl* varDecl )
{
varDecl = varDecl->getCanonicalDecl();
- // I don't use the normal ignoreLocation() here, because I __want__ to include files that are
- // compiled in the $WORKDIR since they may refer to normal code
- SourceLocation expansionLoc = compiler.getSourceManager().getExpansionLoc( varDecl->getLocStart() );
- if( compiler.getSourceManager().isInSystemHeader( expansionLoc ))
- return true;
if (varDecl->getStorageClass() != SC_Static)
return true;
@@ -343,6 +333,35 @@ bool UnusedMethods::VisitVarDecl( const VarDecl* varDecl )
return true;
}
+// Sometimes a class will inherit from something, and in the process invoke a template,
+// which can create new methods.
+//
+bool UnusedMethods::VisitCXXRecordDecl( CXXRecordDecl* recordDecl )
+{
+ recordDecl = recordDecl->getCanonicalDecl();
+ if (!recordDecl->hasDefinition())
+ return true;
+// workaround clang-3.5 issue
+#if __clang_major__ > 3 || ( __clang_major__ == 3 && __clang_minor__ >= 6 )
+ for(CXXBaseSpecifier* baseSpecifier = recordDecl->bases_begin();
+ baseSpecifier != recordDecl->bases_end(); ++baseSpecifier)
+ {
+ const Type *baseType = baseSpecifier->getType().getTypePtr();
+ if (isa<TypedefType>(baseSpecifier->getType())) {
+ baseType = dyn_cast<TypedefType>(baseType)->desugar().getTypePtr();
+ }
+ if (isa<RecordType>(baseType)) {
+ const RecordType *baseRecord = dyn_cast<RecordType>(baseType);
+ CXXRecordDecl* baseRecordDecl = dyn_cast<CXXRecordDecl>(baseRecord->getDecl());
+ if (baseRecordDecl && baseRecordDecl->getTemplateInstantiationPattern()) {
+ TraverseCXXRecordDecl(baseRecordDecl);
+ }
+ }
+ }
+#endif
+ return true;
+}
+
loplugin::Plugin::Registration< UnusedMethods > X("unusedmethods", false);
}
diff --git a/compilerplugins/clang/unusedmethods.py b/compilerplugins/clang/unusedmethods.py
index f2b9e5c..1ea2394 100755
--- a/compilerplugins/clang/unusedmethods.py
+++ b/compilerplugins/clang/unusedmethods.py
@@ -2,6 +2,7 @@
import sys
import re
+import io
definitionSet = set()
definitionToSourceLocationMap = dict()
@@ -71,6 +72,7 @@ exclusionSet = set([
"Ring<value_type> * sw::Ring::Ring_node_traits::get_previous(const Ring<value_type> *)",
"void sw::Ring::Ring_node_traits::set_next(Ring<value_type> *,Ring<value_type> *)",
"void sw::Ring::Ring_node_traits::set_previous(Ring<value_type> *,Ring<value_type> *)",
+ "type-parameter-0-0 checking_cast(type-parameter-0-0,type-parameter-0-0)",
# I need to teach the plugin that for loops with range expressions call begin() and end()
"class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<class SwAnchoredObject *const *, class std::__cxx1998::vector<class SwAnchoredObject *, class std::allocator<class SwAnchoredObject *> > >, class std::__debug::vector<class SwAnchoredObject *, class std::allocator<class SwAnchoredObject *> > > SwSortedObjs::begin() const",
"class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<class SwAnchoredObject *const *, class std::__cxx1998::vector<class SwAnchoredObject *, class std::allocator<class SwAnchoredObject *> > >, class std::__debug::vector<class SwAnchoredObject *, class std::allocator<class SwAnchoredObject *> > > SwSortedObjs::end() const",
@@ -85,22 +87,36 @@ exclusionSet = set([
"class chart::opengl::OpenglShapeFactory * getOpenglShapeFactory()",
"class VclAbstractDialogFactory * CreateDialogFactory()",
"_Bool GetSpecialCharsForEdit(class vcl::Window *,const class vcl::Font &,class rtl::OUString &)",
- "const struct ImplTextEncodingData * sal_getFullTextEncodingData(unsigned short)"
+ "const struct ImplTextEncodingData * sal_getFullTextEncodingData(unsigned short)",
+ "class SalInstance * create_SalInstance()",
+ "class SwAbstractDialogFactory * SwCreateDialogFactory()",
+ "class com::sun::star::uno::Reference<class com::sun::star::uno::XInterface> WordPerfectImportFilterDialog_createInstance(const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &)",
+ "class UnoWrapperBase * CreateUnoWrapper()",
+ "class SwAbstractDialogFactory * SwCreateDialogFactory()",
+ "unsigned long GetSaveWarningOfMSVBAStorage_ww8(class SfxObjectShell &)",
+ "unsigned long SaveOrDelMSVBAStorage_ww8(class SfxObjectShell &,class SotStorage &,unsigned char,const class rtl::OUString &)",
+ "void ExportRTF(const class rtl::OUString &,const class rtl::OUString &,class tools::SvRef<class Writer> &)",
+ "void ExportDOC(const class rtl::OUString &,const class rtl::OUString &,class tools::SvRef<class Writer> &)",
+ "class Reader * ImportRTF()",
+ "void ImportXE(class SwDoc &,class SwPaM &,const class rtl::OUString &)",
+ "_Bool TestImportDOC(const class rtl::OUString &,const class rtl::OUString &)",
+ "class vcl::Window * CreateWindow(class VCLXWindow **,const struct com::sun::star::awt::WindowDescriptor *,class vcl::Window *,long)",
])
# The parsing here is designed to avoid grabbing stuff which is mixed in from gbuild.
# I have not yet found a way of suppressing the gbuild output.
-with open(sys.argv[1]) as txt:
+with io.open(sys.argv[1], "rb", buffering=1024*1024) as txt:
for line in txt:
if line.startswith("definition:\t"):
- tokens = line.split("\t")
- funcInfo = (tokens[1], tokens[2])
+ idx1 = line.find("\t",12)
+ idx2 = line.find("\t",idx1+1)
+ funcInfo = (line[12:idx1], line[idx1+1:idx2])
definitionSet.add(funcInfo)
- definitionToSourceLocationMap[funcInfo] = tokens[3].strip()
+ definitionToSourceLocationMap[funcInfo] = line[idx2+1:].strip()
elif line.startswith("call:\t"):
- tokens = line.split("\t")
- callSet.add((tokens[1], tokens[2].strip()))
+ idx1 = line.find("\t",6)
+ callSet.add((line[6:idx1], line[idx1+1:].strip()))
tmp1set = set()
for d in definitionSet:
@@ -137,6 +153,10 @@ for d in definitionSet:
clazz2 = clazz.replace("::iterator", "::const_iterator") + " const"
if ((d[0],clazz2) in callSet):
continue
+ # just ignore iterators, they normally occur in pairs, and we typically want to leave one constness version alone
+ # alone if the other one is in use.
+ if d[1] == "begin() const" or d[1] == "begin()" or d[1] == "end()" or d[1] == "end() const":
+ continue
# There is lots of macro magic going on in SRCDIR/include/sax/fshelper.hxx that should be using C++11 varag templates
if d[1].startswith("sax_fastparser::FastSerializerHelper::"):
continue
@@ -171,9 +191,13 @@ for d in definitionSet:
# ignore the VCL_BUILDER_DECL_FACTORY stuff
if d[0]=="void" and d[1].startswith("make") and ("(class VclPtr<class vcl::Window> &" in d[1]):
continue
+ # ignore methods used to dump objects to stream - normally used for debugging
+ if d[0] == "class std::basic_ostream<char> &" and d[1].startswith("operator<<(class std::basic_ostream<char> &"):
+ continue
tmp1set.add((clazz, definitionToSourceLocationMap[d]))
+# sort the results using a "natural order" so sequences like [item1,item2,item10] sort nicely
def natural_sort_key(s, _nsre=re.compile('([0-9]+)')):
return [int(text) if text.isdigit() else text.lower()
for text in re.split(_nsre, s)]
diff --git a/connectivity/source/commontools/DateConversion.cxx b/connectivity/source/commontools/DateConversion.cxx
index 4678990..b50fd8c 100644
--- a/connectivity/source/commontools/DateConversion.cxx
+++ b/connectivity/source/commontools/DateConversion.cxx
@@ -297,7 +297,6 @@ void DBTypeConversion::setValue(const Reference<XColumnUpdate>& xVariant,
case NumberFormat::DATETIME:
case NumberFormat::TIME:
DBTypeConversion::setValue(xVariant,rNullDate,fValue,nRealUsedTypeClass);
- // xVariant->updateDouble(toStandardDbDate(rNullDate, fValue));
break;
case NumberFormat::CURRENCY:
case NumberFormat::NUMBER:
diff --git a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx
index 87c4483..9b968d4 100644
--- a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx
+++ b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx
@@ -66,11 +66,6 @@ void OFieldDescGenWin::SetReadOnly( bool bReadOnly )
m_pFieldControl->SetReadOnly(bReadOnly);
}
-OUString OFieldDescGenWin::GetControlText( sal_uInt16 nControlId )
-{
- return m_pFieldControl->GetControlText(nControlId);
-}
-
void OFieldDescGenWin::SetControlText( sal_uInt16 nControlId, const OUString& rText )
{
// set texts of the controls
diff --git a/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx b/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx
index c80a54c..41bd5dd 100644
--- a/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx
+++ b/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx
@@ -48,7 +48,6 @@ namespace dbaui
void DisplayData( OFieldDescription* pFieldDescr );
void SaveData( OFieldDescription* pFieldDescr );
void SetControlText( sal_uInt16 nControlId, const OUString& rText );
- OUString GetControlText( sal_uInt16 nControlId );
void SetReadOnly( bool bReadOnly );
OTableEditorCtrl* GetEditorCtrl();
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index c5885a5..5d51934 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -298,71 +298,6 @@ void ExtensionBox_Impl::checkIndex( sal_Int32 nIndex ) const
}
-OUString ExtensionBox_Impl::getItemName( sal_Int32 nIndex ) const
-{
- const ::osl::MutexGuard aGuard( m_entriesMutex );
- checkIndex( nIndex );
- return m_vEntries[ nIndex ]->m_sTitle;
-}
-
-
-OUString ExtensionBox_Impl::getItemVersion( sal_Int32 nIndex ) const
-{
- const ::osl::MutexGuard aGuard( m_entriesMutex );
- checkIndex( nIndex );
- return m_vEntries[ nIndex ]->m_sVersion;
-}
-
-
-OUString ExtensionBox_Impl::getItemDescription( sal_Int32 nIndex ) const
-{
- const ::osl::MutexGuard aGuard( m_entriesMutex );
- checkIndex( nIndex );
- return m_vEntries[ nIndex ]->m_sDescription;
-}
-
-
-OUString ExtensionBox_Impl::getItemPublisher( sal_Int32 nIndex ) const
-{
- const ::osl::MutexGuard aGuard( m_entriesMutex );
- checkIndex( nIndex );
- return m_vEntries[ nIndex ]->m_sPublisher;
-}
-
-
-OUString ExtensionBox_Impl::getItemPublisherLink( sal_Int32 nIndex ) const
-{
- const ::osl::MutexGuard aGuard( m_entriesMutex );
- checkIndex( nIndex );
- return m_vEntries[ nIndex ]->m_sPublisherURL;
-}
-
-
-void ExtensionBox_Impl::select( sal_Int32 nIndex )
-{
- const ::osl::MutexGuard aGuard( m_entriesMutex );
- checkIndex( nIndex );
- selectEntry( nIndex );
-}
-
-
-void ExtensionBox_Impl::select( const OUString & sName )
-{
- const ::osl::MutexGuard aGuard( m_entriesMutex );
- typedef ::std::vector< TEntry_Impl >::const_iterator It;
-
- for ( It iIter = m_vEntries.begin(); iIter != m_vEntries.end(); ++iIter )
- {
- if ( sName.equals( (*iIter)->m_sTitle ))
- {
- long nPos = iIter - m_vEntries.begin();
- selectEntry( nPos );
- break;
- }
- }
-}
-
-
// Title + description
void ExtensionBox_Impl::CalcActiveHeight( const long nPos )
{
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
index 29b6891..c2df79d 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
@@ -215,45 +215,6 @@ public:
When nothing is selected, which is the case when getItemCount returns '0',
then this function returns ENTRY_NOTFOUND */
virtual sal_Int32 getSelIndex() const SAL_OVERRIDE;
-
- /** @return The item name of the entry with the given index
- The index starts with 0.
- Throws an css::lang::IllegalArgumentException, when the position is invalid. */
- virtual OUString getItemName( sal_Int32 index ) const SAL_OVERRIDE;
-
- /** @return The version string of the entry with the given index
- The index starts with 0.
- Throws an css::lang::IllegalArgumentException, when the position is invalid. */
- virtual OUString getItemVersion( sal_Int32 index ) const SAL_OVERRIDE;
-
- /** @return The description string of the entry with the given index
- The index starts with 0.
- Throws an css::lang::IllegalArgumentException, when the position is invalid. */
- virtual OUString getItemDescription( sal_Int32 index ) const SAL_OVERRIDE;
-
- /** @return The publisher string of the entry with the given index
- The index starts with 0.
- Throws an css::lang::IllegalArgumentException, when the position is invalid. */
- virtual OUString getItemPublisher( sal_Int32 index ) const SAL_OVERRIDE;
-
- /** @return The link behind the publisher text of the entry with the given index
- The index starts with 0.
- Throws an css::lang::IllegalArgumentException, when the position is invalid. */
- virtual OUString getItemPublisherLink( sal_Int32 index ) const SAL_OVERRIDE;
-
- /** The entry at the given position will be selected
- Index starts with 0.
- Throws an css::lang::IllegalArgumentException, when the position is invalid. */
- virtual void select( sal_Int32 pos ) SAL_OVERRIDE;
-
- /** The first found entry with the given name will be selected
- When there was no entry found with the name, the selection doesn't change.
- Please note that there might be more than one entry with the same
- name, because:
- 1. the name is not unique
- 2. one extension can be installed as user and shared extension.
- */
- virtual void select( const OUString & sName ) SAL_OVERRIDE;
};
}
diff --git a/editeng/source/outliner/overflowingtxt.cxx b/editeng/source/outliner/overflowingtxt.cxx
index 6ead858..da4c34b 100644
--- a/editeng/source/outliner/overflowingtxt.cxx
+++ b/editeng/source/outliner/overflowingtxt.cxx
@@ -199,11 +199,6 @@ OFlowChainedText::~OFlowChainedText()
}
-ESelection OFlowChainedText::GetInsertionPointSel()
-{
- return OverflowingText::GetInsertionPointSel();
-}
-
ESelection OFlowChainedText::GetOverflowPointSel() const
{
return mpNonOverflowingTxt->GetOverflowPointSel();
diff --git a/extensions/source/propctrlr/pcrcommon.hxx b/extensions/source/propctrlr/pcrcommon.hxx
index 6a026c7..9c34bba 100644
--- a/extensions/source/propctrlr/pcrcommon.hxx
+++ b/extensions/source/propctrlr/pcrcommon.hxx
@@ -100,8 +100,6 @@ namespace pcr
inline sal_Int32 size() const { return UnoBase::getLength(); }
inline bool empty() const { return UnoBase::getLength() == 0; }
-
- inline void resize( size_t _newSize ) { UnoBase::realloc( _newSize ); }
};
diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx
index 5a180be..aa55568 100644
--- a/filter/source/msfilter/util.cxx
+++ b/filter/source/msfilter/util.cxx
@@ -123,132 +123,6 @@ sal_Unicode bestFitOpenSymbolToMSFont(sal_Unicode cChar,
return cChar;
}
-/*
- http://social.msdn.microsoft.com/Forums/hu-HU/os_openXML-ecma/thread/1bf1f185-ee49-4314-94e7-f4e1563b5c00
-
- The following information is being submitted to the standards working group as
- a proposed resolution to a defect report and is not yet part of ISO 29500-1.
- ...
- For each Unicode character in DrawingML text, the font face can be any of four
- font "slots": latin ($21.1.2.3.7), cs ($21.1.2.3.1), ea ($21.1.2.3.3), or sym
- ($21.1.2.3.10), as specified in the following table. For all ranges not
- explicitly called out below, the ea font shall be used.
-
- U+0000-U+007F Use latin font
- U+0080-U+00A6 Use latin font
- U+00A9-U+00AF Use latin font
- U+00B2-U+00B3 Use latin font
- U+00B5-U+00D6 Use latin font
- U+00D8-U+00F6 Use latin font
- U+00F8-U+058F Use latin font
- U+0590-U+074F Use cs font
- U+0780-U+07BF Use cs font
- U+0900-U+109F Use cs font
- U+10A0-U+10FF Use latin font
- U+1200-U+137F Use latin font
- U+13A0-U+177F Use latin font
- U+1D00-U+1D7F Use latin font
- U+1E00-U+1FFF Use latin font
- U+1780-U+18AF Use cs font
- U+2000-U+200B Use latin font
- U+200C-U+200F Use cs font
- U+2010-U+2029 Use latin font Except, for the quote characters in the range
- 2018 - 201E, use ea font if the text has one of the following language
- identifiers: ii-CN, ja-JP, ko-KR, zh-CN, zh-HK, zh-MO, zh-SG, zh-TW.
- U+202A-U+202F Use cs font
- U+2030-U+2046 Use latin font
- U+204A-U+245F Use latin font
- U+2670-U+2671 Use cs font
- U+27C0-U+2BFF Use latin font
- U+3099-U+309A Use ea font
- U+D835 Use latin font
- U+F000-U+F0FF Symbol, use sym font
- U+FB00-U+FB17 Use latin font
- U+FB1D-U+FB4F Use cs font
- U+FE50-U+FE6F Use latin font
- Otherwise Use ea font
-*/
-TextCategory categorizeCodePoint(sal_uInt32 codePoint, const OUString &rBcp47LanguageTag)
-{
- TextCategory eRet = ea;
- if (codePoint <= 0x007F)
- eRet = latin;
- else if (0x0080 <= codePoint && codePoint <= 0x00A6)
- eRet = latin;
- else if (0x00A9 <= codePoint && codePoint <= 0x00AF)
- eRet = latin;
- else if (0x00B2 <= codePoint && codePoint <= 0x00B3)
- eRet = latin;
- else if (0x00B5 <= codePoint && codePoint <= 0x00D6)
- eRet = latin;
- else if (0x00D8 <= codePoint && codePoint <= 0x00F6)
- eRet = latin;
- else if (0x00F8 <= codePoint && codePoint <= 0x058F)
- eRet = latin;
- else if (0x0590 <= codePoint && codePoint <= 0x074F)
- eRet = cs;
- else if (0x0780 <= codePoint && codePoint <= 0x07BF)
- eRet = cs;
- else if (0x0900 <= codePoint && codePoint <= 0x109F)
- eRet = cs;
- else if (0x10A0 <= codePoint && codePoint <= 0x10FF)
- eRet = latin;
- else if (0x1200 <= codePoint && codePoint <= 0x137F)
- eRet = latin;
- else if (0x13A0 <= codePoint && codePoint <= 0x177F)
- eRet = latin;
- else if (0x1D00 <= codePoint && codePoint <= 0x1D7F)
- eRet = latin;
- else if (0x1E00 <= codePoint && codePoint <= 0x1FFF)
- eRet = latin;
- else if (0x1780 <= codePoint && codePoint <= 0x18AF)
- eRet = cs;
- else if (0x2000 <= codePoint && codePoint <= 0x200B)
- eRet = latin;
- else if (0x200C <= codePoint && codePoint <= 0x200F)
- eRet = cs;
- else if (0x2010 <= codePoint && codePoint <= 0x2029)
- {
- eRet = latin;
- if (0x2018 <= codePoint && codePoint <= 0x201E)
- {
- if (rBcp47LanguageTag == "ii-CN" ||
- rBcp47LanguageTag == "ja-JP" ||
- rBcp47LanguageTag == "ko-KR" ||
- rBcp47LanguageTag == "zh-CN" ||
- rBcp47LanguageTag == "zh-HK" ||
- rBcp47LanguageTag == "zh-MO" ||
- rBcp47LanguageTag == "zh-SG" ||
- rBcp47LanguageTag == "zh-TW")
- {
- eRet = ea;
- }
- }
- }
- else if (0x202A <= codePoint && codePoint <= 0x202F)
- eRet = cs;
- else if (0x2030 <= codePoint && codePoint <= 0x2046)
- eRet = latin;
- else if (0x204A <= codePoint && codePoint <= 0x245F)
- eRet = latin;
- else if (0x2670 <= codePoint && codePoint <= 0x2671)
- eRet = latin;
- else if (0x27C0 <= codePoint && codePoint <= 0x2BFF)
- eRet = latin;
- else if (0x3099 <= codePoint && codePoint <= 0x309A)
- eRet = ea;
- else if (0xD835 == codePoint)
- eRet = latin;
- else if (0xF000 <= codePoint && codePoint <= 0xF0FF)
- eRet = sym;
- else if (0xFB00 <= codePoint && codePoint <= 0xFB17)
- eRet = latin;
- else if (0xFB1D <= codePoint && codePoint <= 0xFB4F)
- eRet = cs;
- else if (0xFE50 <= codePoint && codePoint <= 0xFE6F)
- eRet = latin;
- return eRet;
-}
OString ConvertColor( const Color &rColor, bool bAutoColor )
{
diff --git a/filter/source/svg/gfxtypes.hxx b/filter/source/svg/gfxtypes.hxx
index d51d74e..b7047a8 100644
--- a/filter/source/svg/gfxtypes.hxx
+++ b/filter/source/svg/gfxtypes.hxx
@@ -62,8 +62,6 @@ struct GradientStop
ARGBColor maStopColor;
double mnStopPosition;
};
-inline bool operator==( const GradientStop& rLHS, const GradientStop& rRHS )
-{ return rLHS.mnStopPosition==rRHS.mnStopPosition && rLHS.maStopColor==rRHS.maStopColor; }
struct Gradient
{
diff --git a/i18npool/inc/breakiteratorImpl.hxx b/i18npool/inc/breakiteratorImpl.hxx
index 4dc6ee9..56a0947 100644
--- a/i18npool/inc/breakiteratorImpl.hxx
+++ b/i18npool/inc/breakiteratorImpl.hxx
@@ -129,9 +129,6 @@ private:
throw( com::sun::star::uno::RuntimeException );
com::sun::star::uno::Reference < XBreakIterator > SAL_CALL getLocaleSpecificBreakIterator( const com::sun::star::lang::Locale& rLocale )
throw( com::sun::star::uno::RuntimeException );
- const com::sun::star::lang::Locale& SAL_CALL getLocaleByScriptType(const com::sun::star::lang::Locale& rLocale, const OUString& Text,
- sal_Int32 nStartPos, bool forward, bool skipWhiteSpace)
- throw(com::sun::star::uno::RuntimeException);
};
diff --git a/i18npool/inc/defaultnumberingprovider.hxx b/i18npool/inc/defaultnumberingprovider.hxx
index 7e1269d..dc9b113a 100644
--- a/i18npool/inc/defaultnumberingprovider.hxx
+++ b/i18npool/inc/defaultnumberingprovider.hxx
@@ -39,9 +39,6 @@ class DefaultNumberingProvider : public cppu::WeakImplHelper
com::sun::star::lang::XServiceInfo
>
{
- void GetCharStrN( sal_Int32 nValue, sal_Int16 nType, OUString& rStr ) const;
- void GetCharStr( sal_Int32 nValue, sal_Int16 nType, OUString& rStr ) const;
- void GetRomanString( sal_Int32 nValue, sal_Int16 nType, OUString& rStr ) const;
void impl_loadTranslit();
public:
DefaultNumberingProvider(
diff --git a/i18npool/inc/localedata.hxx b/i18npool/inc/localedata.hxx
index fb567ad..f4c8d5f 100644
--- a/i18npool/inc/localedata.hxx
+++ b/i18npool/inc/localedata.hxx
@@ -127,7 +127,6 @@ private:
::std::unique_ptr< LocaleDataLookupTableItem > cachedItem;
oslGenericFunction SAL_CALL getFunctionSymbol( const com::sun::star::lang::Locale& rLocale, const sal_Char* pFunction ) throw( com::sun::star::uno::RuntimeException );
- oslGenericFunction SAL_CALL getFunctionSymbolByName( const OUString& localeName, const sal_Char* pFunction );
sal_Unicode ** SAL_CALL getIndexArray(const com::sun::star::lang::Locale& rLocale, sal_Int16& indexCount);
sal_Unicode ** SAL_CALL getIndexArrayForAlgorithm(const com::sun::star::lang::Locale& rLocale, const OUString& rAlgorithm);
com::sun::star::i18n::Calendar2 ref_cal;
diff --git a/idl/inc/bastype.hxx b/idl/inc/bastype.hxx
index fcfc8d0..36b957e 100644
--- a/idl/inc/bastype.hxx
+++ b/idl/inc/bastype.hxx
@@ -57,8 +57,6 @@ public:
operator bool() const { return nVal; }
bool IsSet() const { return bSet; }
- friend SvStream& operator >> (SvStream &, SvBOOL &);
-
bool ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm );
};
@@ -146,7 +144,6 @@ public:
return !(*this == r);
}
- friend SvStream& operator >> (SvStream &, SvVersion &);
bool ReadSvIdl( SvTokenStream & rInStm );
};
diff --git a/idl/source/objects/bastype.cxx b/idl/source/objects/bastype.cxx
index 196b2aa..1d3d070 100644
--- a/idl/source/objects/bastype.cxx
+++ b/idl/source/objects/bastype.cxx
@@ -57,38 +57,6 @@ static bool ReadRangeSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm,
return false;
}
-SvStream& operator >> (SvStream & rStm, SvBOOL & rb )
-{
- sal_uInt8 n;
- rStm.ReadUChar( n );
- rb.nVal = (n & 0x01) != 0;
- rb.bSet = (n & 0x02) != 0;
- if( n & ~0x03 )
- {
- rStm.SetError( SVSTREAM_FILEFORMAT_ERROR );
- OSL_FAIL( "format error" );
- }
- return rStm;
-}
-
-SvStream& operator >> (SvStream & rStm, SvVersion & r )
-{
- sal_uInt8 n;
- rStm.ReadUChar( n );
- if( n == 0 )
- { // not compressed
- rStm.ReadUInt16( r.nMajorVersion );
- rStm.ReadUInt16( r.nMinorVersion );
- }
- else
- { // compressed
- r.nMajorVersion = (n >> 4) & 0x0F;
- r.nMinorVersion = n & 0x0F;
- }
- return rStm;
-}
-
-
bool SvBOOL::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm )
{
sal_uInt32 nTokPos = rInStm.Tell();
diff --git a/include/connectivity/dbconversion.hxx b/include/connectivity/dbconversion.hxx
index 7eecd27..635ebf4 100644
--- a/include/connectivity/dbconversion.hxx
+++ b/include/connectivity/dbconversion.hxx
@@ -116,10 +116,6 @@ namespace dbtools
OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::util::Date toDate(sal_Int32 _nVal);
OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::util::Time toTime(sal_Int64 _nVal);
- /** convert a double which is a date value relative to a given fixed date into a date value relative
- to the standard db null date.
- */
- inline double toStandardDbDate(const ::com::sun::star::util::Date& _rNullDate, double _rVal) { return _rVal + toDays(_rNullDate); }
/** convert a double which is a date value relative to the standard db null date into a date value relative
to a given fixed date.
*/
diff --git a/include/editeng/AccessibleParaManager.hxx b/include/editeng/AccessibleParaManager.hxx
index e146051..e9b26dd 100644
--- a/include/editeng/AccessibleParaManager.hxx
+++ b/include/editeng/AccessibleParaManager.hxx
@@ -287,15 +287,6 @@ namespace accessibility
Argument maArg;
};
- /** Generic algorithm on given paragraphs
-
- Convenience method, that already adapts the given functor with WeakChildAdapter
- */
- template < typename Functor > void ForEach( Functor& rFunctor )
- {
- ::std::for_each( begin(), end(), WeakChildAdapter< Functor >(rFunctor) );
- }
-
private:
/// Set state on given child
void SetState( sal_Int32 nChild, const sal_Int16 nStateId );
diff --git a/include/editeng/editstat.hxx b/include/editeng/editstat.hxx
index 3ec7c39..fa5c771 100644
--- a/include/editeng/editstat.hxx
+++ b/include/editeng/editstat.hxx
@@ -98,14 +98,6 @@ namespace o3tl
EditStatusFlags::CRSRLEFTPARA at the time cursor movement and the enter.
*/
-inline void SetFlags( EEControlBits& rBits, EEControlBits nMask, bool bOn )
-{
- if ( bOn )
- rBits |= nMask;
- else
- rBits &= ~nMask;
-}
-
inline void SetFlags( EVControlBits& rBits, EVControlBits nMask, bool bOn )
{
if ( bOn )
diff --git a/include/editeng/itemtype.hxx b/include/editeng/itemtype.hxx
index 54a518e..f92f72c 100644
--- a/include/editeng/itemtype.hxx
+++ b/include/editeng/itemtype.hxx
@@ -42,13 +42,6 @@ EDITENG_DLLPUBLIC sal_uInt16 GetMetricId( SfxMapUnit eUnit );
-inline OUString GetBoolString(bool bVal)
-{
- return EE_RESSTR(bVal ? RID_SVXITEMS_TRUE : RID_SVXITEMS_FALSE);
-}
-
-
-
inline long Scale( long nVal, long nMult, long nDiv )
{
BigInt aVal( nVal );
diff --git a/include/editeng/overflowingtxt.hxx b/include/editeng/overflowingtxt.hxx
index faa77f8..2d263fc 100644
--- a/include/editeng/overflowingtxt.hxx
+++ b/include/editeng/overflowingtxt.hxx
@@ -116,14 +116,10 @@ public:
OutlinerParaObject *InsertOverflowingText(Outliner *, OutlinerParaObject *);
OutlinerParaObject *RemoveOverflowingText(Outliner *);
- static ESelection GetInsertionPointSel();
ESelection GetOverflowPointSel() const;
bool IsLastParaInterrupted() const;
-protected:
- void impSetOutlinerToEmptyTxt(Outliner *);
-
private:
NonOverflowingText *mpNonOverflowingTxt;
OverflowingText *mpOverflowingTxt;
diff --git a/include/filter/msfilter/util.hxx b/include/filter/msfilter/util.hxx
index 9ab2439..0d85588 100644
--- a/include/filter/msfilter/util.hxx
+++ b/include/filter/msfilter/util.hxx
@@ -61,15 +61,6 @@ enum TextCategory
sym //Symbol
};
-/** Categorize codepoints according to how MS seems to do it.
-
- It's been bugging me for ages as to what codepoint MS considers in
- what category. Tom Jebo has a post suggesting the criteria used here
- and indicating its been submitting to the standards working group
- as a proposed resolution.
-*/
-MSFILTER_DLLPUBLIC TextCategory categorizeCodePoint(sal_uInt32 codePoint, const OUString &rBcp47LanguageTag);
-
#define OOXML_COLOR_AUTO 0x0a
/**
diff --git a/include/linguistic/misc.hxx b/include/linguistic/misc.hxx
index 3310f91..386e04d 100644
--- a/include/linguistic/misc.hxx
+++ b/include/linguistic/misc.hxx
@@ -144,7 +144,6 @@ LNG_DLLPUBLIC bool HasDigits( const OUString &rText );
LNG_DLLPUBLIC bool IsNumeric( const OUString &rText );
-::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > GetOneInstanceService( const char *pServiceName );
LNG_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XLinguProperties > GetLinguProperties();
::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSearchableDictionaryList > GetDictionaryList();
::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > GetIgnoreAllList();
diff --git a/include/oox/crypto/CryptTools.hxx b/include/oox/crypto/CryptTools.hxx
index 86bfb79..c1602af 100644
--- a/include/oox/crypto/CryptTools.hxx
+++ b/include/oox/crypto/CryptTools.hxx
@@ -154,9 +154,6 @@ public:
static bool sha512(std::vector<sal_uInt8>& digest, std::vector<sal_uInt8>& input);
};
-bool sha1( std::vector<sal_uInt8>& digest, std::vector<sal_uInt8>& input);
-bool sha512(std::vector<sal_uInt8>& digest, std::vector<sal_uInt8>& input);
-
} // namespace core
} // namespace oox
diff --git a/include/oox/drawingml/chart/modelbase.hxx b/include/oox/drawingml/chart/modelbase.hxx
index 0d01fc4..5dc25fb 100644
--- a/include/oox/drawingml/chart/modelbase.hxx
+++ b/include/oox/drawingml/chart/modelbase.hxx
@@ -83,8 +83,6 @@ public:
~ModelMap() {}
ModelType& create( KeyType eKey ) { return insert( eKey, new ModelType ); }
- template< typename Param1Type >
- ModelType& create( KeyType eKey, const Param1Type& rParam1 ) { return insert( eKey, new ModelType( rParam1 ) ); }
private:
ModelType& insert( KeyType eKey, ModelType* pModel ) { (*this)[ eKey ].reset( pModel ); return *pModel; }
diff --git a/include/oox/helper/binaryinputstream.hxx b/include/oox/helper/binaryinputstream.hxx
index 423af9c..36edfe3 100644
--- a/include/oox/helper/binaryinputstream.hxx
+++ b/include/oox/helper/binaryinputstream.hxx
@@ -116,21 +116,6 @@ public:
template< typename Type >
sal_Int32 readArray( Type* opnArray, sal_Int32 nElemCount );
- /** Reads a sequence of values from the stream.
-
- The sequence will be reallocated internally. Converts all values in the
- array to platform byte order. All data types supported by the
- ByteOrderConverter class can be used.
-
- @param nElemCount
- Number of elements to put into the sequence (NOT byte count).
-
- @return
- Number of sequence elements really read (NOT byte count).
- */
- template< typename Type >
- sal_Int32 readArray( ::com::sun::star::uno::Sequence< Type >& orSequence, sal_Int32 nElemCount );
-
/** Reads a vector of values from the stream.
The vector will be resized internally. Converts all values in the
@@ -146,16 +131,6 @@ public:
template< typename Type >
sal_Int32 readArray( ::std::vector< Type >& orVector, sal_Int32 nElemCount );
- /** Skips an array of values of a certain type in the stream.
-
- All data types supported by the ByteOrderConverter class can be used.
-
- @param nElemCount
- Number of array elements to skip (NOT byte count).
- */
- template< typename Type >
- void skipArray( sal_Int32 nElemCount );
-
/** Reads a NUL-terminated Unicode character array and returns the string.
*/
OUString readNulUnicodeArray();
@@ -253,26 +228,12 @@ sal_Int32 BinaryInputStream::readArray( Type* opnArray, sal_Int32 nElemCount )
}
template< typename Type >
-sal_Int32 BinaryInputStream::readArray( ::com::sun::star::uno::Sequence< Type >& orSequence, sal_Int32 nElemCount )
-{
- orSequence.reallocate( nElemCount );
- return orSequence.hasElements() ? readArray( orSequence.getArray(), nElemCount ) : 0;
-}
-
-template< typename Type >
sal_Int32 BinaryInputStream::readArray( ::std::vector< Type >& orVector, sal_Int32 nElemCount )
{
orVector.resize( static_cast< size_t >( nElemCount ) );
return orVector.empty() ? 0 : readArray( &orVector.front(), nElemCount );
}
-template< typename Type >
-void BinaryInputStream::skipArray( sal_Int32 nElemCount )
-{
- sal_Int32 nSkipSize = getLimitedValue< sal_Int32, sal_Int32 >( nElemCount, 0, SAL_MAX_INT32 / sizeof( Type ) ) * sizeof( Type );
- skip( nSkipSize, sizeof( Type ) );
-}
-
/** Wraps a UNO input stream and provides convenient access functions.
diff --git a/include/sfx2/StylePreviewRenderer.hxx b/include/sfx2/StylePreviewRenderer.hxx
index 1fc9804..971ce01 100644
--- a/include/sfx2/StylePreviewRenderer.hxx
+++ b/include/sfx2/StylePreviewRenderer.hxx
@@ -48,11 +48,6 @@ public:
virtual ~StylePreviewRenderer()
{}
- void setRenderText(OUString& rRenderText)
- {
- msRenderText = rRenderText;
- }
-
virtual bool recalculate() = 0;
virtual Size getRenderSize() = 0;
virtual bool render(const Rectangle& aRectangle, RenderAlign eRenderAlign = RenderAlign::CENTER) = 0;
diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx
index 5c5efee..f1dd6a7 100644
--- a/include/sfx2/thumbnailview.hxx
+++ b/include/sfx2/thumbnailview.hxx
@@ -292,8 +292,6 @@ protected:
SFX2_DLLPRIVATE bool ImplHasAccessibleListeners();
DECL_DLLPRIVATE_LINK_TYPED( ImplScrollHdl, ScrollBar*, void );
- DECL_LINK(OnItemSelected, ThumbnailViewItem*);
-
protected:
ThumbnailValueItemList mItemList;
diff --git a/include/svl/urlbmk.hxx b/include/svl/urlbmk.hxx
index 3cdf343..a0b97a2 100644
--- a/include/svl/urlbmk.hxx
+++ b/include/svl/urlbmk.hxx
@@ -35,11 +35,6 @@ class INetBookmark
OUString aUrl;
OUString aDescr;
-protected:
-
- void SetURL( const OUString& rS ) { aUrl = rS; }
- void SetDescription( const OUString& rS ) { aDescr = rS; }
-
public:
INetBookmark( const OUString &rUrl, const OUString &rDescr )
: aUrl( rUrl ), aDescr( rDescr )
diff --git a/include/svtools/accessibilityoptions.hxx b/include/svtools/accessibilityoptions.hxx
index 15484c7..828532c 100644
--- a/include/svtools/accessibilityoptions.hxx
+++ b/include/svtools/accessibilityoptions.hxx
@@ -42,16 +42,13 @@ public:
bool GetIsAllowAnimatedGraphics() const;
bool GetIsAllowAnimatedText() const;
bool GetIsAutomaticFontColor() const;
- sal_Int16 GetHelpTipSeconds() const;
bool IsSelectionInReadonly() const;
bool GetAutoDetectSystemHC() const;
void SetIsForPagePreviews(bool bSet);
- void SetIsHelpTipsDisappear(bool bSet);
void SetIsAllowAnimatedGraphics(bool bSet);
void SetIsAllowAnimatedText(bool bSet);
void SetIsAutomaticFontColor(bool bSet);
- void SetHelpTipSeconds(sal_Int16 nSet);
void SetSelectionInReadonly(bool bSet);
void SetAutoDetectSystemHC(bool bSet);
diff --git a/include/svtools/extensionlistbox.hxx b/include/svtools/extensionlistbox.hxx
index 57f7725..66dc7cb 100644
--- a/include/svtools/extensionlistbox.hxx
+++ b/include/svtools/extensionlistbox.hxx
@@ -48,44 +48,6 @@ public:
then this function returns ENTRY_NOTFOUND */
virtual sal_Int32 getSelIndex() const = 0;
- /** @return The item name of the entry with the given index
- The index starts with 0.
- Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */
- virtual OUString getItemName( sal_Int32 index ) const = 0;
-
- /** @return The version string of the entry with the given index
- The index starts with 0.
- Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */
- virtual OUString getItemVersion( sal_Int32 index ) const = 0;
-
- /** @return The description string of the entry with the given index
- The index starts with 0.
- Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */
- virtual OUString getItemDescription( sal_Int32 index ) const = 0;
-
- /** @return The publisher string of the entry with the given index
- The index starts with 0.
- Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */
- virtual OUString getItemPublisher( sal_Int32 index ) const = 0;
-
- /** @return The link behind the publisher text of the entry with the given index
- The index starts with 0.
- Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */
- virtual OUString getItemPublisherLink( sal_Int32 index ) const = 0;
-
- /** The entry at the given position will be selected
- Index starts with 0.
- Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */
- virtual void select( sal_Int32 index ) = 0;
-
- /** The first found entry with the given name will be selected
- When there was no entry found with the name, the selection doesn't change.
- Please note that there might be more than one entry with the same
- name, because:
- 1. the name is not unique
- 2. one extension can be installed as user and shared extension.
- */
- virtual void select( const OUString & sName ) = 0;
};
diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx
index 6e4999a..c3e01dd 100644
--- a/include/svtools/grfmgr.hxx
+++ b/include/svtools/grfmgr.hxx
@@ -340,7 +340,6 @@ public:
bool operator!=( const GraphicObject& rCacheObj ) const { return !( *this == rCacheObj ); }
bool HasSwapStreamHdl() const { return maSwapStreamHdl.IsSet(); }
- void SetSwapStreamHdl();
void SetSwapStreamHdl(const Link<const GraphicObject*, SvStream*>& rHdl);
void FireSwapInRequest();
diff --git a/include/svtools/headbar.hxx b/include/svtools/headbar.hxx
index 3cf0519..5da0c1c 100644
--- a/include/svtools/headbar.hxx
+++ b/include/svtools/headbar.hxx
@@ -344,7 +344,6 @@ public:
inline void SetDragHdl( const Link<HeaderBar*,void>& rLink ) { maDragHdl = rLink; }
inline void SetEndDragHdl( const Link<HeaderBar*,void>& rLink ) { maEndDragHdl = rLink; }
inline void SetSelectHdl( const Link<HeaderBar*,void>& rLink ) { maSelectHdl = rLink; }
- inline void SetDoubleClickHdl( const Link<HeaderBar*,void>& rLink ) { maDoubleClickHdl = rLink; }
inline void SetCreateAccessibleHdl( const Link<HeaderBar*,void>& rLink ) { maCreateAccessibleHdl = rLink; }
inline bool IsDragable() const { return mbDragable; }
diff --git a/include/svtools/htmlcfg.hxx b/include/svtools/htmlcfg.hxx
index 4dc2485..3239ac7 100644
--- a/include/svtools/htmlcfg.hxx
+++ b/include/svtools/htmlcfg.hxx
@@ -54,8 +54,7 @@ public:
bool IsImportUnknown() const;
void SetImportUnknown(bool bSet);
- sal_uInt16 GetExportMode() const;
- void SetExportMode(sal_uInt16 nSet);
+ sal_uInt16 GetExportMode() const;
bool IsStarBasic() const;
void SetStarBasic(bool bSet);
diff --git a/include/svtools/optionsdrawinglayer.hxx b/include/svtools/optionsdrawinglayer.hxx
index cad738c..25951f6 100644
--- a/include/svtools/optionsdrawinglayer.hxx
+++ b/include/svtools/optionsdrawinglayer.hxx
@@ -130,9 +130,6 @@ class SVT_DLLPUBLIC SvtOptionsDrawinglayer
// combined with Application::GetSettings().GetStyleSettings().GetHighlightColor())
Color getHilightColor() const;
- void SetTransparentSelection( bool bState );
- void SetTransparentSelectionPercent( sal_uInt16 nPercent );
-
private:
/*-****************************************************************************************************
diff --git a/include/svx/fmtools.hxx b/include/svx/fmtools.hxx
index 57305c6a..4f83660 100644
--- a/include/svx/fmtools.hxx
+++ b/include/svx/fmtools.hxx
@@ -78,7 +78,6 @@ namespace vcl { class Window; }
// displaying a database exception for the user
// display info about a simple css::sdbc::SQLException
void displayException(const css::sdbc::SQLException&, vcl::Window* _pParent = NULL);
-void displayException(const css::sdbc::SQLWarning&, vcl::Window* _pParent = NULL);
SVX_DLLPUBLIC void displayException(const css::sdb::SQLContext&, vcl::Window* _pParent = NULL);
void displayException(const css::sdb::SQLErrorEvent&, vcl::Window* _pParent = NULL);
void displayException(const css::uno::Any&, vcl::Window* _pParent = NULL);
diff --git a/include/svx/framelink.hxx b/include/svx/framelink.hxx
index e64f1ce..17fc58b 100644
--- a/include/svx/framelink.hxx
+++ b/include/svx/framelink.hxx
@@ -173,10 +173,8 @@ private:
bool operator==( const Style& rL, const Style& rR );
SVX_DLLPUBLIC bool operator<( const Style& rL, const Style& rR );
-inline bool operator!=( const Style& rL, const Style& rR ) { return !(rL == rR); }
inline bool operator>( const Style& rL, const Style& rR ) { return rR < rL; }
inline bool operator<=( const Style& rL, const Style& rR ) { return !(rR < rL); }
-inline bool operator>=( const Style& rL, const Style& rR ) { return !(rL < rR); }
@@ -219,24 +217,6 @@ SVX_DLLPUBLIC double GetHorDiagAngle( long nWidth, long nHeight );
/** Returns the angle between horizontal border of a rectangle and its diagonal.
The returned values represents the inner angle between the diagonals and
- horizontal borders, and is therefore in the range [0,PI/2] (inclusive). The
- passed rectangle positions may be unordered, they are adjusted internally.
- */
-inline double GetHorDiagAngle( long nX1, long nX2, long nY1, long nY2 )
-{ return GetHorDiagAngle( nX2 - nX1, nY2 - nY1 ); }
-
-/** Returns the angle between horizontal border of a rectangle and its diagonal.
-
- The returned values represents the inner angle between the diagonals and
- horizontal borders, and is therefore in the range [0,PI/2] (inclusive). The
- passed rectangle edges may be unordered, they are adjusted internally.
- */
-inline double GetHorDiagAngle( const Point& rP1, const Point& rP2 )
-{ return GetHorDiagAngle( rP2.X() - rP1.X(), rP2.Y() - rP1.Y() ); }
-
-/** Returns the angle between horizontal border of a rectangle and its diagonal.
-
- The returned values represents the inner angle between the diagonals and
horizontal borders, and is therefore in the range [0,PI/2] (inclusive).
*/
inline double GetHorDiagAngle( const Rectangle& rRect )
@@ -256,24 +236,6 @@ inline double GetVerDiagAngle( long nWidth, long nHeight )
/** Returns the angle between vertical border of a rectangle and its diagonal.
The returned values represents the inner angle between the diagonals and
- vertical borders, and is therefore in the range [0,PI/2] (inclusive). The
- passed rectangle positions may be unordered, they are adjusted internally.
- */
-inline double GetVerDiagAngle( long nX1, long nX2, long nY1, long nY2 )
-{ return GetVerDiagAngle( nX2 - nX1, nY2 - nY1 ); }
-
-/** Returns the angle between vertical border of a rectangle and its diagonal.
-
- The returned values represents the inner angle between the diagonals and
- vertical borders, and is therefore in the range [0,PI/2] (inclusive). The
- passed rectangle edges may be unordered, they are adjusted internally.
- */
-inline double GetVerDiagAngle( const Point& rP1, const Point& rP2 )
-{ return GetVerDiagAngle( rP2.X() - rP1.X(), rP2.Y() - rP1.Y() ); }
-
-/** Returns the angle between vertical border of a rectangle and its diagonal.
-
- The returned values represents the inner angle between the diagonals and
vertical borders, and is therefore in the range [0,PI/2] (inclusive).
*/
inline double GetVerDiagAngle( const Rectangle& rRect )
diff --git a/include/svx/ofaitem.hxx b/include/svx/ofaitem.hxx
index 9da0818..3340f5e 100644
--- a/include/svx/ofaitem.hxx
+++ b/include/svx/ofaitem.hxx
@@ -66,10 +66,6 @@ public:
{
return mxRef;
}
- inline void SetValue( const rtl::Reference<reference_type> &xRef )
- {
- mxRef = xRef;
- }
};
#endif
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index 8bcb82f..6379540 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -331,8 +331,7 @@ public:
static void SetTextDefaults( SfxItemPool* pItemPool, sal_uIntPtr nDefTextHgt );
SdrOutliner& GetChainingOutliner(const SdrTextObj* pObj=NULL) const;
- TextChain *GetTextChain() const;
- static void SetNextLinkInTextChain(SdrTextObj *pPrev, SdrTextObj *pNext);
+ TextChain * GetTextChain() const;
// ReferenceDevice for the EditEngine
void SetRefDevice(OutputDevice* pDev);
diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx
index 651a61d..2552f67 100644
--- a/include/svx/svdotext.hxx
+++ b/include/svx/svdotext.hxx
@@ -520,8 +520,6 @@ public:
void SetTextEditOutliner(SdrOutliner* pOutl) { pEdtOutl=pOutl; }
- void SetToBeChained(bool bToBeChained);
-
/** Setup given Outliner equivalently to SdrTextObj::Paint()
To setup an arbitrary Outliner in the same way as the draw
diff --git a/include/svx/svdtrans.hxx b/include/svx/svdtrans.hxx
index 2f20a41..a8f5d77 100644
--- a/include/svx/svdtrans.hxx
+++ b/include/svx/svdtrans.hxx
@@ -55,7 +55,6 @@ inline long Round(double a) { return a>0.0 ? (long)(a+0.5) : -(long)((-a)+0.5);
inline void MoveRect(Rectangle& rRect, const Size& S) { rRect.Move(S.Width(),S.Height()); }
inline void MovePoint(Point& rPnt, const Size& S) { rPnt.X()+=S.Width(); rPnt.Y()+=S.Height(); }
inline void MovePoly(tools::Polygon& rPoly, const Size& S) { rPoly.Move(S.Width(),S.Height()); }
-inline void MovePoly(tools::PolyPolygon& rPoly, const Size& S) { rPoly.Move(S.Width(),S.Height()); }
void MoveXPoly(XPolygon& rPoly, const Size& S);
SVX_DLLPUBLIC void ResizeRect(Rectangle& rRect, const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bNoJustify = false);
@@ -69,7 +68,6 @@ void RotateXPoly(XPolygon& rPoly, const Point& rRef, double sn, double cs);
void RotateXPoly(XPolyPolygon& rPoly, const Point& rRef, double sn, double cs);
void MirrorPoint(Point& rPnt, const Point& rRef1, const Point& rRef2);
-void MirrorPoly(tools::Polygon& rPoly, const Point& rRef1, const Point& rRef2);
void MirrorXPoly(XPolygon& rPoly, const Point& rRef1, const Point& rRef2);
inline void ShearPoint(Point& rPnt, const Point& rRef, double tn, bool bVShear = false);
diff --git a/include/svx/textchainflow.hxx b/include/svx/textchainflow.hxx
index 3e95bbc..3d58e02 100644
--- a/include/svx/textchainflow.hxx
+++ b/include/svx/textchainflow.hxx
@@ -101,8 +101,6 @@ public:
protected:
virtual void impLeaveOnlyNonOverflowingText(SdrOutliner *) SAL_OVERRIDE;
- virtual void impSetTextForEditingOutliner(OutlinerParaObject *);
-
virtual void impSetFlowOutlinerParams(SdrOutliner *, SdrOutliner *) SAL_OVERRIDE;
private:
diff --git a/include/unotools/fontoptions.hxx b/include/unotools/fontoptions.hxx
index e0526bb..286ed74 100644
--- a/include/unotools/fontoptions.hxx
+++ b/include/unotools/fontoptions.hxx
@@ -72,10 +72,9 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtFontOptions : public utl::detail::Op
@onerror No error should occur!
*//*-*****************************************************************************************************/
- bool IsFontHistoryEnabled ( ) const;
- void EnableFontHistory ( bool bState );
+ bool IsFontHistoryEnabled ( ) const;
- bool IsFontWYSIWYGEnabled ( ) const;
+ bool IsFontWYSIWYGEnabled ( ) const;
void EnableFontWYSIWYG ( bool bState );
private:
diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx
index 318064b..191a6e7 100644
--- a/include/vcl/graphicfilter.hxx
+++ b/include/vcl/graphicfilter.hxx
@@ -287,7 +287,6 @@ public:
sal_uInt16 ExportGraphic( const Graphic& rGraphic, const OUString& rPath,
SvStream& rOStm, sal_uInt16 nFormat = GRFILTER_FORMAT_DONTKNOW,
const css::uno::Sequence< css::beans::PropertyValue >* pFilterData = NULL );
- long GetExportGraphicHint() const { return nExpGraphHint; }
sal_uInt16 CanImportGraphic( const INetURLObject& rPath,
sal_uInt16 nFormat = GRFILTER_FORMAT_DONTKNOW,
diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index 0be5645..f3d0f98 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -363,9 +363,6 @@ public:
virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE;
};
-VCL_DLLPUBLIC void setGridAttach(vcl::Window &rWidget, sal_Int32 nLeft, sal_Int32 nTop,
- sal_Int32 nWidth = 1, sal_Int32 nHeight = 1);
-
class VCL_DLLPUBLIC VclBin : public VclContainer
{
public:
diff --git a/include/vcl/ppdparser.hxx b/include/vcl/ppdparser.hxx
index 71cc210..92edf09 100644
--- a/include/vcl/ppdparser.hxx
+++ b/include/vcl/ppdparser.hxx
@@ -95,11 +95,9 @@ public:
const PPDValue* getValue( const OUString& rOption ) const;
const PPDValue* getValueCaseInsensitive( const OUString& rOption ) const;
const PPDValue* getDefaultValue() const { return m_pDefaultValue; }
- const PPDValue* getQueryValue() const { return m_bQueryValue ? &m_aQueryValue : NULL; }
const OUString& getKey() const { return m_aKey; }
bool isUIKey() const { return m_bUIOption; }
- UIType getUIType() const { return m_eUIType; }
SetupType getSetupType() const { return m_eSetupType; }
int getOrderDependency() const { return m_nOrderDependency; }
};
@@ -195,9 +193,6 @@ private:
static OUString getPPDFile( const OUString& rFile );
public:
static const PPDParser* getParser( const OUString& rFile );
- static void freeAll();
-
- const OUString& getFilename() const { return m_aFile; }
const PPDKey* getKey( int n ) const;
const PPDKey* getKey( const OUString& rKey ) const;
@@ -206,11 +201,6 @@ public:
const ::std::list< PPDConstraint >& getConstraints() const { return m_aConstraints; }
- const OUString& getPrinterName() const
- { return m_aPrinterName.isEmpty() ? m_aNickName : m_aPrinterName; }
- const OUString& getNickName() const
- { return m_aNickName.isEmpty() ? m_aPrinterName : m_aNickName; }
-
bool isColorDevice() const { return m_bColorDevice; }
bool isType42Capable() const { return m_bType42Capable; }
sal_uLong getLanguageLevel() const { return m_nLanguageLevel; }
@@ -222,8 +212,6 @@ public:
int& rWidth, int& rHeight ) const;
// width and height in pt
// returns false if paper not found
- int getPaperDimensions() const
- { return m_pPaperDimensions ? m_pPaperDimensions->countValues() : 0; }
// match the best paper for width and height
OUString matchPaper( int nWidth, int nHeight ) const;
@@ -237,21 +225,12 @@ public:
// values int pt
OUString getDefaultInputSlot() const;
- int getInputSlots() const
- { return m_pInputSlots ? m_pInputSlots->countValues() : 0; }
void getDefaultResolution( int& rXRes, int& rYRes ) const;
// values in dpi
static void getResolutionFromString( const OUString&, int&, int& );
// helper function
- int getDuplexTypes() const
- { return m_pDuplexTypes ? m_pDuplexTypes->countValues() : 0; }
-
- int getFonts() const
- { return m_pFontList ? m_pFontList->countValues() : 0; }
-
-
OUString translateKey( const OUString& i_rKey,
const com::sun::star::lang::Locale& i_rLocale = com::sun::star::lang::Locale() ) const;
OUString translateOption( const OUString& i_rKey,
diff --git a/include/vcl/prgsbar.hxx b/include/vcl/prgsbar.hxx
index 28fbec3..56cbbe6 100644
--- a/include/vcl/prgsbar.hxx
+++ b/include/vcl/prgsbar.hxx
@@ -81,7 +81,6 @@ public:
virtual Size GetOptimalSize() const SAL_OVERRIDE;
void SetValue( sal_uInt16 nNewPercent );
- sal_uInt16 GetValue() const { return mnPercent; }
};
#endif // INCLUDED_VCL_PRGSBAR_HXX
diff --git a/include/vcl/printerinfomanager.hxx b/include/vcl/printerinfomanager.hxx
index 3f1debf..d41a7c8 100644
--- a/include/vcl/printerinfomanager.hxx
+++ b/include/vcl/printerinfomanager.hxx
@@ -137,9 +137,6 @@ public:
// lists the names of all known printers
void listPrinters( std::list< OUString >& rList ) const;
- // gets the number of known printers
- int countPrinters() const { return m_aPrinters.size(); }
-
// gets info about a named printer
const PrinterInfo& getPrinterInfo( const OUString& rPrinter ) const;
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 812112b..341f1c5 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -456,8 +456,6 @@ inline bool ImplDoTiledRendering()
namespace vcl { class Window; }
-vcl::Window* ImplFindWindow( const SalFrame* pFrame, Point& rSalFramePos );
-
namespace vcl { class Cursor; }
class Dialog;
class WindowImpl;
@@ -550,7 +548,6 @@ private:
#ifdef DBG_UTIL
friend const char* ::ImplDbgCheckWindow( const void* pObj );
#endif
- friend vcl::Window* ::ImplFindWindow( const SalFrame* pFrame, Point& rSalFramePos );
public:
diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx
index e888837..4c2d85c 100644
--- a/sd/source/ui/inc/OutlineView.hxx
+++ b/sd/source/ui/inc/OutlineView.hxx
@@ -96,12 +96,12 @@ public:
void Paint (const Rectangle& rRect, ::sd::Window* pWin);
// Callbacks fuer LINKs
- DECL_LINK_TYPED( ParagraphInsertedHdl, Outliner *, void );
- DECL_LINK_TYPED( ParagraphRemovingHdl, Outliner *, void );
- DECL_LINK_TYPED( DepthChangedHdl, Outliner *, void );
+ DECL_LINK_TYPED( ParagraphInsertedHdl, ::Outliner *, void );
+ DECL_LINK_TYPED( ParagraphRemovingHdl, ::Outliner *, void );
+ DECL_LINK_TYPED( DepthChangedHdl, ::Outliner *, void );
DECL_LINK_TYPED( StatusEventHdl, EditStatus&, void );
- DECL_LINK_TYPED( BeginMovingHdl, Outliner *, void );
- DECL_LINK_TYPED( EndMovingHdl, Outliner *, void );
+ DECL_LINK_TYPED( BeginMovingHdl, ::Outliner *, void );
+ DECL_LINK_TYPED( EndMovingHdl, ::Outliner *, void );
DECL_LINK_TYPED( RemovingPagesHdl, OutlinerView *, bool );
DECL_LINK_TYPED( IndentingPagesHdl, OutlinerView *, bool );
DECL_LINK_TYPED( BeginDropHdl, EditView*, void );
diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx
index 897caef..a5ed52a 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -502,12 +502,6 @@ IMPL_LINK_TYPED( ThumbnailView,ImplScrollHdl, ScrollBar*, pScrollBar, void )
}
}
-IMPL_LINK (ThumbnailView, OnItemSelected, ThumbnailViewItem*, pItem)
-{
- maItemStateHdl.Call(pItem);
- return 0;
-}
-
void ThumbnailView::KeyInput( const KeyEvent& rKEvt )
{
// Get the last selected item in the list
diff --git a/svtools/source/config/accessibilityoptions.cxx b/svtools/source/config/accessibilityoptions.cxx
index c083ffc..cc7e1e4 100644
--- a/svtools/source/config/accessibilityoptions.cxx
+++ b/svtools/source/config/accessibilityoptions.cxx
@@ -89,11 +89,9 @@ public:
void SetAutoDetectSystemHC(bool bSet);
void SetIsForPagePreviews(bool bSet);
- void SetIsHelpTipsDisappear(bool bSet);
void SetIsAllowAnimatedGraphics(bool bSet);
void SetIsAllowAnimatedText(bool bSet);
void SetIsAutomaticFontColor(bool bSet);
- void SetHelpTipSeconds(sal_Int16 nSet);
void SetSelectionInReadonly(bool bSet);
};
@@ -391,26 +389,6 @@ void SvtAccessibilityOptions_Impl::SetIsForPagePreviews(bool bSet)
}
}
-void SvtAccessibilityOptions_Impl::SetIsHelpTipsDisappear(bool bSet)
-{
- css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY);
-
- try
- {
- if(xNode.is() && xNode->getPropertyValue(s_sIsHelpTipsDisappear)!=bSet)
- {
- xNode->setPropertyValue(s_sIsHelpTipsDisappear, css::uno::makeAny(bSet));
- ::comphelper::ConfigurationHelper::flush(m_xCfg);
-
- bIsModified = true;
- }
- }
- catch(const css::uno::Exception& ex)
- {
- SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
- }
-}
-
void SvtAccessibilityOptions_Impl::SetIsAllowAnimatedGraphics(bool bSet)
{
css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY);
@@ -471,26 +449,6 @@ void SvtAccessibilityOptions_Impl::SetIsAutomaticFontColor(bool bSet)
}
}
-void SvtAccessibilityOptions_Impl::SetHelpTipSeconds(sal_Int16 nSet)
-{
- css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY);
-
- try
- {
- if(xNode.is() && xNode->getPropertyValue(s_sHelpTipSeconds)!=nSet)
- {
- xNode->setPropertyValue(s_sHelpTipSeconds, css::uno::makeAny(nSet));
- ::comphelper::ConfigurationHelper::flush(m_xCfg);
-
- bIsModified = true;
- }
- }
- catch(const css::uno::Exception& ex)
- {
- SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
- }
-}
-
void SvtAccessibilityOptions_Impl::SetSelectionInReadonly(bool bSet)
{
css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY);
@@ -629,10 +587,6 @@ bool SvtAccessibilityOptions::GetIsAutomaticFontColor() const
{
return sm_pSingleImplConfig->GetIsAutomaticFontColor();
}
-sal_Int16 SvtAccessibilityOptions::GetHelpTipSeconds() const
-{
- return sm_pSingleImplConfig->GetHelpTipSeconds();
-}
bool SvtAccessibilityOptions::IsSelectionInReadonly() const
{
return sm_pSingleImplConfig->IsSelectionInReadonly();
@@ -647,10 +601,6 @@ void SvtAccessibilityOptions::SetIsForPagePreviews(bool bSet)
{
sm_pSingleImplConfig->SetIsForPagePreviews(bSet);
}
-void SvtAccessibilityOptions::SetIsHelpTipsDisappear(bool bSet)
-{
- sm_pSingleImplConfig->SetIsHelpTipsDisappear(bSet);
-}
void SvtAccessibilityOptions::SetIsAllowAnimatedGraphics(bool bSet)
{
sm_pSingleImplConfig->SetIsAllowAnimatedGraphics(bSet);
@@ -663,10 +613,6 @@ void SvtAccessibilityOptions::SetIsAutomaticFontColor(bool bSet)
{
sm_pSingleImplConfig->SetIsAutomaticFontColor(bSet);
}
-void SvtAccessibilityOptions::SetHelpTipSeconds(sal_Int16 nSet)
-{
- sm_pSingleImplConfig->SetHelpTipSeconds(nSet);
-}
void SvtAccessibilityOptions::SetSelectionInReadonly(bool bSet)
{
sm_pSingleImplConfig->SetSelectionInReadonly(bSet);
diff --git a/svtools/source/config/htmlcfg.cxx b/svtools/source/config/htmlcfg.cxx
index 073ac0e..84c6cb8 100644
--- a/svtools/source/config/htmlcfg.cxx
+++ b/svtools/source/config/htmlcfg.cxx
@@ -296,18 +296,6 @@ sal_uInt16 SvxHtmlOptions::GetExportMode() const
-void SvxHtmlOptions::SetExportMode(sal_uInt16 nSet)
-{
- if(nSet <= HTML_CFG_MAX )
- {
- pImp->nExportMode = nSet;
- SetModified();
- }
-}
-
-
-
-
bool SvxHtmlOptions::IsStarBasic() const
{
return 0 != (pImp->nFlags & HTMLCFG_STAR_BASIC) ;
diff --git a/svtools/source/config/optionsdrawinglayer.cxx b/svtools/source/config/optionsdrawinglayer.cxx
index 1b1ecc8..d1ee4cd 100644
--- a/svtools/source/config/optionsdrawinglayer.cxx
+++ b/svtools/source/config/optionsdrawinglayer.cxx
@@ -217,9 +217,6 @@ public:
sal_uInt16 GetTransparentSelectionPercent() const { return m_nTransparentSelectionPercent;}
sal_uInt16 GetSelectionMaximumLuminancePercent() const { return m_nSelectionMaximumLuminancePercent;}
- void SetTransparentSelection( bool bState );
- void SetTransparentSelectionPercent( sal_uInt16 nPercent );
-
// private methods
private:
@@ -757,29 +754,6 @@ void SvtOptionsDrawinglayer_Impl::SetAntiAliasing( bool bState )
}
}
-// #i97672# selection settings
-
-void SvtOptionsDrawinglayer_Impl::SetTransparentSelection( bool bState )
-{
- if(m_bTransparentSelection != bState)
- {
- m_bTransparentSelection = bState;
- SetModified();
- }
-}
-
-void SvtOptionsDrawinglayer_Impl::SetTransparentSelectionPercent( sal_uInt16 nPercent )
-{
- if(m_nTransparentSelectionPercent != nPercent)
- {
- m_nTransparentSelectionPercent = nPercent;
- SetModified();
- }
-}
-
-
-
-
// private method
Sequence< OUString > SvtOptionsDrawinglayer_Impl::impl_GetPropertyNames()
@@ -1058,12 +1032,6 @@ bool SvtOptionsDrawinglayer::IsTransparentSelection() const
return m_pDataContainer->IsTransparentSelection();
}
-void SvtOptionsDrawinglayer::SetTransparentSelection( bool bState )
-{
- MutexGuard aGuard( GetOwnStaticMutex() );
- m_pDataContainer->SetTransparentSelection( bState );
-}
-
sal_uInt16 SvtOptionsDrawinglayer::GetTransparentSelectionPercent() const
{
MutexGuard aGuard( GetOwnStaticMutex() );
@@ -1083,24 +1051,6 @@ sal_uInt16 SvtOptionsDrawinglayer::GetTransparentSelectionPercent() const
return aRetval;
}
-void SvtOptionsDrawinglayer::SetTransparentSelectionPercent( sal_uInt16 nPercent )
-{
- MutexGuard aGuard( GetOwnStaticMutex() );
-
- // crop to range [10% .. 90%]
- if(nPercent < 10)
- {
- nPercent = 10;
- }
-
- if(nPercent > 90)
- {
- nPercent = 90;
- }
-
- m_pDataContainer->SetTransparentSelectionPercent( nPercent );
-}
-
sal_uInt16 SvtOptionsDrawinglayer::GetSelectionMaximumLuminancePercent() const
{
MutexGuard aGuard( GetOwnStaticMutex() );
diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx
index a1f1015..9289c43 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -425,15 +425,6 @@ void GraphicObject::SetUserData( const OUString& rUserData )
SetSwapState();
}
-void GraphicObject::SetSwapStreamHdl()
-{
- if( mpSwapOutTimer )
- {
- delete mpSwapOutTimer, mpSwapOutTimer = NULL;
- }
- maSwapStreamHdl = Link<const GraphicObject*, SvStream*>();
-}
-
static sal_uInt32 GetCacheTimeInMs()
{
if (utl::ConfigManager::IsAvoidConfig())
diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx
index 40217b7..5cef4a7 100644
--- a/svx/source/form/fmtools.cxx
+++ b/svx/source/form/fmtools.cxx
@@ -148,12 +148,6 @@ void displayException(const ::com::sun::star::sdbc::SQLException& _rExcept, vcl:
}
-void displayException(const ::com::sun::star::sdbc::SQLWarning& _rExcept, vcl::Window* _pParent)
-{
- displayException(makeAny(_rExcept), _pParent);
-}
-
-
void displayException(const ::com::sun::star::sdb::SQLContext& _rExcept, vcl::Window* _pParent)
{
displayException(makeAny(_rExcept), _pParent);
diff --git a/svx/source/svdraw/svdconv.hxx b/svx/source/svdraw/svdconv.hxx
index b6ec765..e2b415d 100644
--- a/svx/source/svdraw/svdconv.hxx
+++ b/svx/source/svdraw/svdconv.hxx
@@ -12,14 +12,8 @@
#include <sal/types.h>
-template<typename T> inline T ImplMMToTwips(T val);
-template<>
inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
-template<>
-inline sal_Int64 ImplMMToTwips(sal_Int64 nVal) { return ((nVal * 72 + 63) / 127); }
-template<typename T> inline T ImplTwipsToMM(T val);
-template<>
inline double ImplTwipsToMM(double fVal) { return (fVal * (127.0 / 72.0)); }
#endif // INCLUDED_SVX_SOURCE_SVDRAW_SVDCONV_HXX
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index a498df1..6762b07 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -2016,12 +2016,6 @@ TextChain *SdrModel::GetTextChain() const
return pTextChain;
}
-void SdrModel::SetNextLinkInTextChain(SdrTextObj *pPrev, SdrTextObj *pNext)
-{
- // Delegate to SdrTextObj
- pPrev->SetNextLinkInChain(pNext);
-}
-
const SdrPage* SdrModel::GetMasterPage(sal_uInt16 nPgNum) const
{
DBG_ASSERT(nPgNum < maMaPag.size(), "SdrModel::GetMasterPage: Access out of range (!)");
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index f8362c7..be3953c 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1545,11 +1545,6 @@ bool SdrTextObj::IsToBeChained() const
return mbToBeChained;
}
-void SdrTextObj::SetToBeChained(bool bToBeChained)
-{
- mbToBeChained = bToBeChained;
-}
-
TextChain *SdrTextObj::GetTextChain() const
{
//if (!IsChainable())
diff --git a/svx/source/svdraw/svdtrans.cxx b/svx/source/svdraw/svdtrans.cxx
index 66a5fb8..46264b3 100644
--- a/svx/source/svdraw/svdtrans.cxx
+++ b/svx/source/svdraw/svdtrans.cxx
@@ -133,14 +133,6 @@ void MirrorPoint(Point& rPnt, const Point& rRef1, const Point& rRef2)
}
}
-void MirrorPoly(tools::Polygon& rPoly, const Point& rRef1, const Point& rRef2)
-{
- sal_uInt16 nCount=rPoly.GetSize();
- for (sal_uInt16 i=0; i<nCount; i++) {
- MirrorPoint(rPoly[i],rRef1,rRef2);
- }
-}
-
void MirrorXPoly(XPolygon& rPoly, const Point& rRef1, const Point& rRef2)
{
sal_uInt16 nCount=rPoly.GetPointCount();
diff --git a/svx/source/svdraw/textchainflow.cxx b/svx/source/svdraw/textchainflow.cxx
index 2ce012c..7ef3c00 100644
--- a/svx/source/svdraw/textchainflow.cxx
+++ b/svx/source/svdraw/textchainflow.cxx
@@ -293,13 +293,6 @@ void EditingTextChainFlow::impLeaveOnlyNonOverflowingText(SdrOutliner *pNonOverf
//GetLinkTarget()->NbcSetOutlinerParaObject(pNewText);
}
-void EditingTextChainFlow::impSetTextForEditingOutliner(OutlinerParaObject *pNewText)
-{
- if (GetLinkTarget()->pEdtOutl != NULL) {
- GetLinkTarget()->pEdtOutl->SetText(*pNewText);
- }
-}
-
void EditingTextChainFlow::impSetFlowOutlinerParams(SdrOutliner *pFlowOutl, SdrOutliner *pParamOutl)
{
// Set right size for overflow
diff --git a/sw/inc/swbaslnk.hxx b/sw/inc/swbaslnk.hxx
index 1df801f..5dcf33a 100644
--- a/sw/inc/swbaslnk.hxx
+++ b/sw/inc/swbaslnk.hxx
@@ -23,28 +23,23 @@
class SwNode;
class SwContentNode;
-class ReReadThread;
class SwBaseLink : public ::sfx2::SvBaseLink
{
- friend long GrfNodeChanged( void* pLink, void* pCaller );
-
SwContentNode* pContentNode;
bool bSwapIn : 1;
bool bNoDataFlag : 1;
bool bIgnoreDataChanged : 1;
- ReReadThread* m_pReReadThread;
protected:
- SwBaseLink(): m_pReReadThread(0) {}
+ SwBaseLink() {}
public:
TYPEINFO_OVERRIDE();
SwBaseLink( SfxLinkUpdateMode nMode, SotClipboardFormatId nFormat, SwContentNode* pNode = 0 )
: ::sfx2::SvBaseLink( nMode, nFormat ), pContentNode( pNode ),
- bSwapIn( false ), bNoDataFlag( false ), bIgnoreDataChanged( false ),
- m_pReReadThread(0)
+ bSwapIn( false ), bNoDataFlag( false ), bIgnoreDataChanged( false )
{}
virtual ~SwBaseLink();
diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx
index 56d4ac1..14d2859 100644
--- a/sw/inc/swtypes.hxx
+++ b/sw/inc/swtypes.hxx
@@ -58,9 +58,6 @@ typedef long SwTwips;
#define INVALID_TWIPS LONG_MAX
#define TWIPS_MAX (LONG_MAX - 1)
-// Converts Twips to Millimeters (1 twip == 17.573 um).
-template <typename T = SwTwips>
-static SAL_CONSTEXPR T TwipsToMm(const double twips) { return static_cast<T>(twips * 0.017573); }
// Converts Millimeters to Twips (1 mm == 56.905479 twips).
template <typename T = SwTwips>
static SAL_CONSTEXPR T MmToTwips(const double mm) { return static_cast<T>(mm / 0.017573); }
diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx b/sw/qa/extras/inc/swmodeltestbase.hxx
index 10d2b63..ce2caac 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -148,10 +148,6 @@ protected:
virtual OUString getTestName() { return OUString(); }
public:
- OUString& getFilterOptions()
- {
- return maFilterOptions;
- }
void setFilterOptions(const OUString &rFilterOptions)
{
maFilterOptions = rFilterOptions;
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index 457d0d8..12bbf0b 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -114,7 +114,6 @@ namespace
struct FindUnoInstanceHint SAL_FINAL : SfxHint
{
FindUnoInstanceHint(Tcoretype* pCore) : m_pCore(pCore), m_pResult(nullptr) {};
- void SetResult(Tunotype* pResult) const { m_pResult = pResult; };
const Tcoretype* const m_pCore;
mutable Tunotype* m_pResult;
};
diff --git a/sw/source/filter/html/svxcss1.hxx b/sw/source/filter/html/svxcss1.hxx
index 697d3c7..a9dc429 100644
--- a/sw/source/filter/html/svxcss1.hxx
+++ b/sw/source/filter/html/svxcss1.hxx
@@ -159,7 +159,6 @@ class SvxCSS1MapEntry
SvxCSS1PropertyInfo aPropInfo;
public:
-
SvxCSS1MapEntry( SfxItemPool& rPool, const sal_uInt16 *pWhichMap ) :
aItemSet( rPool, pWhichMap )
{}
@@ -172,23 +171,8 @@ public:
const SvxCSS1PropertyInfo& GetPropertyInfo() const { return aPropInfo; }
SvxCSS1PropertyInfo& GetPropertyInfo() { return aPropInfo; }
-
- friend bool operator==( const SvxCSS1MapEntry& rE1,
- const SvxCSS1MapEntry& rE2 );
- friend bool operator<( const SvxCSS1MapEntry& rE1,
- const SvxCSS1MapEntry& rE2 );
};
-inline bool operator==( const SvxCSS1MapEntry& rE1, const SvxCSS1MapEntry& rE2 )
-{
- return rE1.aKey==rE2.aKey;
-}
-
-inline bool operator<( const SvxCSS1MapEntry& rE1, const SvxCSS1MapEntry& rE2 )
-{
- return rE1.aKey<rE2.aKey;
-}
-
// Diese Klasse bereitet den Output des CSS1-Parsers auf,
// indem die CSS1-Properties in SvxItem(Set)s umgewandelt werden.
// Ausserdem werden die Selektoren samt zugehoeriger Item-Set
diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx
index c6a4f2a..ba29190 100644
--- a/sw/source/filter/html/wrthtml.hxx
+++ b/sw/source/filter/html/wrthtml.hxx
@@ -249,12 +249,6 @@ struct SwHTMLFormatInfo
bool bHardDrop=false );
~SwHTMLFormatInfo();
- friend bool operator==( const SwHTMLFormatInfo& rInfo1,
- const SwHTMLFormatInfo& rInfo2 )
- {
- return reinterpret_cast<sal_IntPtr>(rInfo1.pFormat) == reinterpret_cast<sal_IntPtr>(rInfo2.pFormat);
- }
-
friend bool operator<( const SwHTMLFormatInfo& rInfo1,
const SwHTMLFormatInfo& rInfo2 )
{
diff --git a/sw/source/filter/ww8/WW8Sttbf.hxx b/sw/source/filter/ww8/WW8Sttbf.hxx
index 9e05bae..8c50744 100644
--- a/sw/source/filter/ww8/WW8Sttbf.hxx
+++ b/sw/source/filter/ww8/WW8Sttbf.hxx
@@ -30,11 +30,10 @@
namespace ww8
{
- typedef boost::shared_array<sal_uInt8> DataArray_t;
-class WW8Struct : public ::sw::ExternalData
+ class WW8Struct : public ::sw::ExternalData
{
- DataArray_t mp_data;
+ boost::shared_array<sal_uInt8> mp_data;
sal_uInt32 mn_offset;
sal_uInt32 mn_size;
@@ -51,29 +50,22 @@ class WW8Struct : public ::sw::ExternalData
OUString getUString(sal_uInt32 nOffset, sal_uInt32 nCount);
};
-typedef ::std::vector<OUString> StringVector_t;
template <class T>
class WW8Sttb : public WW8Struct
{
typedef std::shared_ptr< void > ExtraPointer_t;
- typedef ::std::vector< ExtraPointer_t > ExtrasVector_t;
- bool bDoubleByteCharacters;
- StringVector_t m_Strings;
- ExtrasVector_t m_Extras;
+ bool bDoubleByteCharacters;
+ std::vector<OUString> m_Strings;
+ std::vector< ExtraPointer_t > m_Extras;
public:
WW8Sttb(SvStream& rSt, sal_Int32 nPos, sal_uInt32 nSize);
virtual ~WW8Sttb();
- StringVector_t & getStrings()
+ std::vector<OUString> & getStrings()
{
return m_Strings;
}
-
- const T * getExtra(sal_uInt32 nEntry) const
- {
- return dynamic_cast<const T *> (m_Extras[nEntry].get());
- }
};
template <class T>
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index a0f8c04..8aba853 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -8540,23 +8540,6 @@ void DocxAttributeOutput::BulletDefinition(int nId, const Graphic& rGraphic, Siz
m_pSerializer->endElementNS(XML_w, XML_numPicBullet);
}
-void DocxAttributeOutput::AddToAttrList( std::unique_ptr<sax_fastparser::FastAttributeList>& pAttrList, sal_Int32 nAttrs, ... )
-{
- if( !pAttrList )
- pAttrList.reset(FastSerializerHelper::createAttrList());
-
- va_list args;
- va_start( args, nAttrs );
- for( sal_Int32 i = 0; i<nAttrs; i++)
- {
- sal_Int32 nName = va_arg( args, sal_Int32 );
- const char* pValue = va_arg( args, const char* );
- if( pValue )
- pAttrList->add( nName, pValue );
- }
- va_end( args );
-}
-
void DocxAttributeOutput::AddToAttrList( uno::Reference<sax_fastparser::FastAttributeList>& pAttrList, sal_Int32 nAttrName, const sal_Char* sAttrValue )
{
AddToAttrList( pAttrList, 1, nAttrName, sAttrValue );
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx
index 1878560..6bdf73a 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -714,7 +714,6 @@ private:
void CmdField_Impl( FieldInfos& rInfos );
void EndField_Impl( FieldInfos& rInfos );
- static void AddToAttrList( std::unique_ptr<sax_fastparser::FastAttributeList>& pAttrList, sal_Int32 nArgs, ... );
static void AddToAttrList( css::uno::Reference<sax_fastparser::FastAttributeList>& pAttrList, sal_Int32 nAttrName, const sal_Char* sAttrValue );
static void AddToAttrList( css::uno::Reference<sax_fastparser::FastAttributeList>& pAttrList, sal_Int32 nArgs, ... );
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 6aecff9..7091d25 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -2751,16 +2751,7 @@ void WW8Export::WriteFkpPlcUsw()
if ( pSttbfAssoc ) // #i106057#
{
- ::std::vector<OUString> aStrings;
-
- ::ww8::StringVector_t & aSttbStrings = pSttbfAssoc->getStrings();
- ::ww8::StringVector_t::const_iterator aItEnd = aSttbStrings.end();
- for (::ww8::StringVector_t::const_iterator aIt = aSttbStrings.begin();
- aIt != aItEnd; ++aIt)
- {
- aStrings.push_back(aIt->getStr());
- }
-
+ ::std::vector<OUString> aStrings(pSttbfAssoc->getStrings());
WriteAsStringTable(aStrings, pFib->fcSttbfAssoc,
pFib->lcbSttbfAssoc);
}
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 970f0c5..7684aa3 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -293,7 +293,7 @@ class wwFont
//In some future land the stream could be converted to a nice stream interface
//and we could have harmony
private:
- sal_uInt8 maWW8_FFN[6];
+sal_uInt8 maWW8_FFN[6];
OUString msFamilyNm;
OUString msAltNm;
bool mbAlt;
@@ -301,7 +301,7 @@ private:
FontFamily meFamily;
rtl_TextEncoding meChrSet;
public:
- wwFont( const OUString &rFamilyName, FontPitch ePitch, FontFamily eFamily,
+ wwFont( const OUString &rFamilyName, FontPitch ePitch, FontFamily eFamily,
rtl_TextEncoding eChrSet);
bool Write( SvStream *pTableStram ) const;
void WriteDocx( DocxAttributeOutput* rAttrOutput ) const;
diff --git a/unotools/source/config/fontoptions.cxx b/unotools/source/config/fontoptions.cxx
index fa2b52a..bd177fb 100644
--- a/unotools/source/config/fontoptions.cxx
+++ b/unotools/source/config/fontoptions.cxx
@@ -70,7 +70,6 @@ class SvtFontOptions_Impl : public ConfigItem
*//*-*****************************************************************************************************/
bool IsFontHistoryEnabled ( ) const { return m_bFontHistory;}
- void EnableFontHistory ( bool bState );
bool IsFontWYSIWYGEnabled ( ) const { return m_bFontWYSIWYG;}
void EnableFontWYSIWYG ( bool bState );
@@ -221,14 +220,6 @@ void SvtFontOptions_Impl::ImplCommit()
// public method
-void SvtFontOptions_Impl::EnableFontHistory( bool bState )
-{
- m_bFontHistory = bState;
- SetModified();
-}
-
-// public method
-
void SvtFontOptions_Impl::EnableFontWYSIWYG( bool bState )
{
m_bFontWYSIWYG = bState;
@@ -303,14 +294,6 @@ bool SvtFontOptions::IsFontHistoryEnabled() const
// public method
-void SvtFontOptions::EnableFontHistory( bool bState )
-{
- MutexGuard aGuard( impl_GetOwnStaticMutex() );
- m_pDataContainer->EnableFontHistory( bState );
-}
-
-// public method
-
bool SvtFontOptions::IsFontWYSIWYGEnabled() const
{
MutexGuard aGuard( impl_GetOwnStaticMutex() );
diff --git a/vcl/inc/idlemgr.hxx b/vcl/inc/idlemgr.hxx
index 6d80153..e31fb2c 100644
--- a/vcl/inc/idlemgr.hxx
+++ b/vcl/inc/idlemgr.hxx
@@ -40,9 +40,6 @@ public:
bool InsertIdleHdl( const Link<Application*,void>& rLink, sal_uInt16 nPriority );
void RemoveIdleHdl( const Link<Application*,void>& rLink );
- void RestartIdler()
- { if ( maTimer.IsActive() ) maTimer.Start(); }
-
// Timer* kann auch NULL sein
DECL_LINK_TYPED(TimeoutHdl, Timer *, void);
};
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index 102f894..e559f85 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -239,7 +239,6 @@ class GtkSalFrame : public SalFrame, public X11WindowProvider
static void signalStyleSet( GtkWidget*, GtkStyle* pPrevious, gpointer );
#if GTK_CHECK_VERSION(3,0,0)
static gboolean signalDraw( GtkWidget*, cairo_t *cr, gpointer );
- static void signalFlagsChanged( GtkWidget*, GtkStateFlags, gpointer );
#if GTK_CHECK_VERSION(3,14,0)
static void gestureSwipe(GtkGestureSwipe* gesture, gdouble velocity_x, gdouble velocity_y, gpointer frame);
static void gestureLongPress(GtkGestureLongPress* gesture, gpointer frame);
@@ -263,7 +262,6 @@ class GtkSalFrame : public SalFrame, public X11WindowProvider
void Center();
void SetDefaultSize();
void setAutoLock( bool bLock );
- void setScreenSaverTimeout( int nTimeout );
void doKeyCallback( guint state,
guint keyval,
@@ -322,7 +320,6 @@ class GtkSalFrame : public SalFrame, public X11WindowProvider
void updateWMClass();
void SetScreen( unsigned int nNewScreen, int eType, Rectangle *pSize = NULL );
- DECL_LINK( ImplDelayedFullScreenHdl, void* );
public:
#if GTK_CHECK_VERSION(3,0,0)
basebmp::BitmapDeviceSharedPtr m_aFrame;
diff --git a/vcl/inc/unx/i18n_status.hxx b/vcl/inc/unx/i18n_status.hxx
index ff954ce..223ab54 100644
--- a/vcl/inc/unx/i18n_status.hxx
+++ b/vcl/inc/unx/i18n_status.hxx
@@ -85,9 +85,6 @@ public:
const ::std::vector< ChoiceData >& getChoices() const { return m_aChoices; }
- // for SwitchIMCallback
- void changeIM( const OUString& );
-
// External Control:
/** Toggle the status window on or off.
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index bfe2053..8e209d6 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -322,7 +322,6 @@ public:
srv_vendor_t GetServerVendor() const { return meServerVendor; }
void SetServerVendor() { meServerVendor = sal_GetServerVendor(pDisp_); }
bool IsDisplay() const { return !!pXLib_; }
- GC GetMonoGC( SalX11Screen nXScreen ) const { return getDataForScreen(nXScreen).m_aMonoGC; }
GC GetCopyGC( SalX11Screen nXScreen ) const { return getDataForScreen(nXScreen).m_aCopyGC; }
Pixmap GetInvert50( SalX11Screen nXScreen ) const { return getDataForScreen(nXScreen).m_hInvert50; }
const SalColormap& GetColormap( SalX11Screen nXScreen ) const { return getDataForScreen(nXScreen).m_aColormap; }
diff --git a/vcl/inc/unx/salunxtime.h b/vcl/inc/unx/salunxtime.h
index c20a1aa..e9b4b81a 100644
--- a/vcl/inc/unx/salunxtime.h
+++ b/vcl/inc/unx/salunxtime.h
@@ -44,11 +44,6 @@ inline bool operator > ( const timeval &t1, const timeval &t2 )
return t1.tv_sec > t2.tv_sec;
}
-inline bool operator == ( const timeval &t1, const timeval &t2 )
-{
- return t1.tv_sec == t2.tv_sec && t1.tv_usec == t2.tv_usec;
-}
-
inline timeval &operator -= ( timeval &t1, const timeval &t2 )
{
if( t1.tv_usec < t2.tv_usec )
@@ -61,18 +56,6 @@ inline timeval &operator -= ( timeval &t1, const timeval &t2 )
return t1;
}
-inline timeval &operator += ( timeval &t1, const timeval &t2 )
-{
- t1.tv_sec += t2.tv_sec;
- t1.tv_usec += t2.tv_usec;
- if( t1.tv_usec > 1000000 )
- {
- t1.tv_sec++;
- t1.tv_usec -= 1000000;
- }
- return t1;
-}
-
inline timeval &operator += ( timeval &t1, sal_uIntPtr t2 )
{
t1.tv_sec += t2 / 1000;
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index 7b83ba7..4cc145f 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -282,26 +282,6 @@ bool ImplInitAccessBridge()
}
#endif
-vcl::Window* ImplFindWindow( const SalFrame* pFrame, ::Point& rSalFramePos )
-{
- ImplSVData* pSVData = ImplGetSVData();
- vcl::Window* pFrameWindow = pSVData->maWinData.mpFirstFrame;
- while ( pFrameWindow )
- {
- if ( pFrameWindow->ImplGetFrame() == pFrame )
- {
- vcl::Window* pWindow = pFrameWindow->ImplFindWindow( rSalFramePos );
- if ( !pWindow )
- pWindow = pFrameWindow->ImplGetWindow();
- rSalFramePos = pWindow->ImplFrameToOutput( rSalFramePos );
- return pWindow;
- }
- pFrameWindow = pFrameWindow->ImplGetFrameData()->mpNextFrame;
- }
-
- return NULL;
-}
-
void LocaleConfigurationListener::ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 nHint )
{
AllSettings::LocaleSettingsChanged( nHint );
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 893640f..7f82624 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -1275,14 +1275,6 @@ bool VclGrid::set_property(const OString &rKey, const OString &rValue)
return true;
}
-void setGridAttach(vcl::Window &rWidget, sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nWidth, sal_Int32 nHeight)
-{
- rWidget.set_grid_left_attach(nLeft);
- rWidget.set_grid_top_attach(nTop);
- rWidget.set_grid_width(nWidth);
- rWidget.set_grid_height(nHeight);
-}
-
const vcl::Window *VclBin::get_child() const
{
const WindowImpl* pWindowImpl = ImplGetWindowImpl();
diff --git a/vcl/unx/generic/app/i18n_status.cxx b/vcl/unx/generic/app/i18n_status.cxx
index c3ae8e0..36561b6 100644
--- a/vcl/unx/generic/app/i18n_status.cxx
+++ b/vcl/unx/generic/app/i18n_status.cxx
@@ -586,11 +586,6 @@ void I18NStatus::setStatusText( const OUString& rText )
}
}
-void I18NStatus::changeIM( const OUString& rIM )
-{
- m_aCurrentIM = rIM;
-}
-
SalFrame* I18NStatus::getStatusFrame() const
{
SalFrame* pRet = NULL;
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx
index 5b81897..23735f7 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -1083,7 +1083,6 @@ void GtkSalFrame::InitCommon()
m_aMouseSignalIds.push_back(g_signal_connect( G_OBJECT(pEventWidget), "button-release-event", G_CALLBACK(signalButton), this ));
#if GTK_CHECK_VERSION(3,0,0)
g_signal_connect( G_OBJECT(m_pFixedContainer), "draw", G_CALLBACK(signalDraw), this );
-// g_signal_connect( G_OBJECT(m_pWindow), "state-flags-changed", G_CALLBACK(signalFlagsChanged), this );
#if GTK_CHECK_VERSION(3,14,0)
GtkGesture *pSwipe = gtk_gesture_swipe_new(pEventWidget);
g_signal_connect(pSwipe, "swipe", G_CALLBACK(gestureSwipe), this);
@@ -3498,27 +3497,6 @@ gboolean GtkSalFrame::signalButton( GtkWidget*, GdkEventButton* pEvent, gpointer
return true;
}
-#if GTK_CHECK_VERSION(3,0,0)
-void GtkSalFrame::signalFlagsChanged( GtkWidget* , GtkStateFlags state, gpointer frame )
-{
- //TO-DO: This isn't as helpful as I'd like it to be. The color selector puts the main
- //windows into the backdrop, disabling everything, and the floating navigator window
- //is also problematic.
- GtkSalFrame* pThis = static_cast<GtkSalFrame*>(frame);
-
- bool bOldBackDrop = state & GTK_STATE_FLAG_BACKDROP;
- bool bNewBackDrop = (gtk_widget_get_state_flags(GTK_WIDGET(pThis->m_pWindow)) & GTK_STATE_FLAG_BACKDROP);
- if (bNewBackDrop && !bOldBackDrop)
- {
- pThis->GetWindow()->Disable();
- }
- else if (bOldBackDrop && !bNewBackDrop)
- {
- pThis->GetWindow()->Enable();
- }
-}
-#endif
-
gboolean GtkSalFrame::signalScroll( GtkWidget*, GdkEvent* pEvent, gpointer frame )
{
GtkSalFrame* pThis = static_cast<GtkSalFrame*>(frame);
diff --git a/writerperfect/inc/ImportFilter.hxx b/writerperfect/inc/ImportFilter.hxx
index 6a5bde6..1edd9e9 100644
--- a/writerperfect/inc/ImportFilter.hxx
+++ b/writerperfect/inc/ImportFilter.hxx
@@ -175,11 +175,8 @@ public:
private:
virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) = 0;
virtual bool doImportDocument(librevenge::RVNGInputStream &rInput, Generator &rGenerator, utl::MediaDescriptor &rDescriptor) = 0;
- virtual void doRegisterHandlers(Generator &)
- {
- }
+ virtual void doRegisterHandlers(Generator &) {};
-private:
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext;
::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > mxDoc;
OUString msFilterName;
More information about the Libreoffice-commits
mailing list