update unusedmethods plugin to deal with constructors
and fix the operator< implementations in some of the other plugins too. Change-Id: Ie5631e0cdc8d2a994ad2af2533cdb558a6cfc035 Reviewed-on: https://gerrit.libreoffice.org/25057 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
This commit is contained in:
parent
4e59eecc07
commit
2c8fe2e737
@ -38,7 +38,7 @@ class TkResMgr
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
// no instantiation allowed
|
// no instantiation allowed
|
||||||
TkResMgr() { }
|
TkResMgr() = delete;
|
||||||
~TkResMgr() { }
|
~TkResMgr() { }
|
||||||
|
|
||||||
// we'll instantiate one static member of the following class,
|
// we'll instantiate one static member of the following class,
|
||||||
|
@ -81,7 +81,6 @@ protected:
|
|||||||
|
|
||||||
public:
|
public:
|
||||||
DialogWindow (DialogWindowLayout* pParent, ScriptDocument const& rDocument, const OUString& aLibName, const OUString& aName, css::uno::Reference<css::container::XNameContainer> const& xDialogModel);
|
DialogWindow (DialogWindowLayout* pParent, ScriptDocument const& rDocument, const OUString& aLibName, const OUString& aName, css::uno::Reference<css::container::XNameContainer> const& xDialogModel);
|
||||||
DialogWindow( DialogWindow* pCurView ); // never implemented
|
|
||||||
|
|
||||||
virtual void ExecuteCommand( SfxRequest& rReq ) override;
|
virtual void ExecuteCommand( SfxRequest& rReq ) override;
|
||||||
virtual void GetState( SfxItemSet& ) override;
|
virtual void GetState( SfxItemSet& ) override;
|
||||||
|
@ -63,7 +63,7 @@ namespace basctl
|
|||||||
SignatureState getScriptingSignatureState() const;
|
SignatureState getScriptingSignatureState() const;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
DocumentSignature(); // not implemented
|
DocumentSignature() = delete;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
struct Impl;
|
struct Impl;
|
||||||
|
@ -242,19 +242,6 @@ SbxBase* SbxBase::Load( SvStream& rStrm )
|
|||||||
return p;
|
return p;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Skip the Sbx-Object inside the stream
|
|
||||||
void SbxBase::Skip( SvStream& rStrm )
|
|
||||||
{
|
|
||||||
sal_uInt16 nSbxId, nFlags, nVer;
|
|
||||||
sal_uInt32 nCreator, nSize;
|
|
||||||
rStrm.ReadUInt32( nCreator ).ReadUInt16( nSbxId ).ReadUInt16( nFlags ).ReadUInt16( nVer );
|
|
||||||
|
|
||||||
sal_Size nStartPos = rStrm.Tell();
|
|
||||||
rStrm.ReadUInt32( nSize );
|
|
||||||
|
|
||||||
rStrm.Seek( nStartPos + nSize );
|
|
||||||
}
|
|
||||||
|
|
||||||
bool SbxBase::Store( SvStream& rStrm )
|
bool SbxBase::Store( SvStream& rStrm )
|
||||||
{
|
{
|
||||||
if( ( nFlags & SbxFlagBits::DontStore ) == SbxFlagBits::NONE )
|
if( ( nFlags & SbxFlagBits::DontStore ) == SbxFlagBits::NONE )
|
||||||
|
@ -215,7 +215,6 @@ $(eval $(call gb_Library_add_exception_objects,chartcore,\
|
|||||||
chart2/source/tools/LogarithmicRegressionCurveCalculator \
|
chart2/source/tools/LogarithmicRegressionCurveCalculator \
|
||||||
chart2/source/tools/MeanValueRegressionCurveCalculator \
|
chart2/source/tools/MeanValueRegressionCurveCalculator \
|
||||||
chart2/source/tools/MediaDescriptorHelper \
|
chart2/source/tools/MediaDescriptorHelper \
|
||||||
chart2/source/tools/ModifyListenerCallBack \
|
|
||||||
chart2/source/tools/ModifyListenerHelper \
|
chart2/source/tools/ModifyListenerHelper \
|
||||||
chart2/source/tools/MovingAverageRegressionCurveCalculator \
|
chart2/source/tools/MovingAverageRegressionCurveCalculator \
|
||||||
chart2/source/tools/MutexContainer \
|
chart2/source/tools/MutexContainer \
|
||||||
|
@ -19,7 +19,6 @@
|
|||||||
#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_TP_3D_SCENEILLUMINATION_HXX
|
#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_TP_3D_SCENEILLUMINATION_HXX
|
||||||
#define INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_TP_3D_SCENEILLUMINATION_HXX
|
#define INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_TP_3D_SCENEILLUMINATION_HXX
|
||||||
|
|
||||||
#include "ModifyListenerCallBack.hxx"
|
|
||||||
#include "TimerTriggeredControllerLock.hxx"
|
#include "TimerTriggeredControllerLock.hxx"
|
||||||
|
|
||||||
#include <com/sun/star/beans/XPropertySet.hpp>
|
#include <com/sun/star/beans/XPropertySet.hpp>
|
||||||
|
@ -211,11 +211,6 @@ protected:
|
|||||||
T * m_pT;
|
T * m_pT;
|
||||||
public:
|
public:
|
||||||
|
|
||||||
NegativeGuard(T * pT) : m_pT(pT)
|
|
||||||
{
|
|
||||||
m_pT->release();
|
|
||||||
}
|
|
||||||
|
|
||||||
NegativeGuard(T & t) : m_pT(&t)
|
NegativeGuard(T & t) : m_pT(&t)
|
||||||
{
|
{
|
||||||
m_pT->release();
|
m_pT->release();
|
||||||
|
@ -1,57 +0,0 @@
|
|||||||
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
||||||
/*
|
|
||||||
* This file is part of the LibreOffice project.
|
|
||||||
*
|
|
||||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
||||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
||||||
*
|
|
||||||
* This file incorporates work covered by the following license notice:
|
|
||||||
*
|
|
||||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
||||||
* contributor license agreements. See the NOTICE file distributed
|
|
||||||
* with this work for additional information regarding copyright
|
|
||||||
* ownership. The ASF licenses this file to you under the Apache
|
|
||||||
* License, Version 2.0 (the "License"); you may not use this file
|
|
||||||
* except in compliance with the License. You may obtain a copy of
|
|
||||||
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef INCLUDED_CHART2_SOURCE_INC_MODIFYLISTENERCALLBACK_HXX
|
|
||||||
#define INCLUDED_CHART2_SOURCE_INC_MODIFYLISTENERCALLBACK_HXX
|
|
||||||
|
|
||||||
#include <tools/link.hxx>
|
|
||||||
#include <com/sun/star/util/XModifyBroadcaster.hpp>
|
|
||||||
#include <com/sun/star/util/XModifyListener.hpp>
|
|
||||||
#include "charttoolsdllapi.hxx"
|
|
||||||
|
|
||||||
namespace chart {
|
|
||||||
|
|
||||||
/** Use this class as a member if you want to listen on a XModifyBroadcaster
|
|
||||||
without becoming a XModifyListener yourself
|
|
||||||
*/
|
|
||||||
|
|
||||||
class ModifyListenerCallBack_impl;
|
|
||||||
|
|
||||||
class OOO_DLLPUBLIC_CHARTTOOLS ModifyListenerCallBack
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
explicit ModifyListenerCallBack( const Link<void*,void>& rCallBack );
|
|
||||||
|
|
||||||
virtual ~ModifyListenerCallBack();
|
|
||||||
|
|
||||||
SAL_DLLPRIVATE void stopListening();
|
|
||||||
|
|
||||||
private: //methods
|
|
||||||
ModifyListenerCallBack( const ModifyListenerCallBack& ) = delete;
|
|
||||||
|
|
||||||
private: //member
|
|
||||||
ModifyListenerCallBack_impl* pModifyListener_impl;
|
|
||||||
css::uno::Reference< css::util::XModifyListener > m_xModifyListener;
|
|
||||||
};
|
|
||||||
|
|
||||||
} // namespace chart
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
|
@ -1,105 +0,0 @@
|
|||||||
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
||||||
/*
|
|
||||||
* This file is part of the LibreOffice project.
|
|
||||||
*
|
|
||||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
||||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
||||||
*
|
|
||||||
* This file incorporates work covered by the following license notice:
|
|
||||||
*
|
|
||||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
||||||
* contributor license agreements. See the NOTICE file distributed
|
|
||||||
* with this work for additional information regarding copyright
|
|
||||||
* ownership. The ASF licenses this file to you under the Apache
|
|
||||||
* License, Version 2.0 (the "License"); you may not use this file
|
|
||||||
* except in compliance with the License. You may obtain a copy of
|
|
||||||
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "ModifyListenerCallBack.hxx"
|
|
||||||
#include "MutexContainer.hxx"
|
|
||||||
#include <cppuhelper/compbase.hxx>
|
|
||||||
|
|
||||||
using namespace ::com::sun::star;
|
|
||||||
using ::com::sun::star::uno::Reference;
|
|
||||||
|
|
||||||
namespace chart {
|
|
||||||
|
|
||||||
typedef ::cppu::WeakComponentImplHelper< css::util::XModifyListener >
|
|
||||||
ModifyListenerCallBack_Base;
|
|
||||||
|
|
||||||
class ModifyListenerCallBack_impl
|
|
||||||
: public ::chart::MutexContainer
|
|
||||||
, public ModifyListenerCallBack_Base
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
explicit ModifyListenerCallBack_impl( const Link<void*,void>& rCallBack );
|
|
||||||
virtual ~ModifyListenerCallBack_impl();
|
|
||||||
|
|
||||||
void stopListening();
|
|
||||||
|
|
||||||
//XModifyListener
|
|
||||||
virtual void SAL_CALL modified( const lang::EventObject& aEvent ) throw (uno::RuntimeException, std::exception) override;
|
|
||||||
|
|
||||||
//XEventListener
|
|
||||||
virtual void SAL_CALL disposing( const lang::EventObject& Source ) throw (uno::RuntimeException, std::exception) override;
|
|
||||||
|
|
||||||
using ::cppu::WeakComponentImplHelperBase::disposing;
|
|
||||||
|
|
||||||
private:
|
|
||||||
Link<void*,void> m_aLink;//will be called on modify
|
|
||||||
Reference< util::XModifyBroadcaster > m_xBroadcaster;//broadcaster to listen at
|
|
||||||
};
|
|
||||||
|
|
||||||
ModifyListenerCallBack_impl::ModifyListenerCallBack_impl( const Link<void*,void>& rCallBack )
|
|
||||||
: ModifyListenerCallBack_Base( m_aMutex )
|
|
||||||
, m_aLink( rCallBack )
|
|
||||||
, m_xBroadcaster(nullptr)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
ModifyListenerCallBack_impl::~ModifyListenerCallBack_impl()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
//XModifyListener
|
|
||||||
void SAL_CALL ModifyListenerCallBack_impl::modified( const lang::EventObject& /*aEvent*/ ) throw (uno::RuntimeException, std::exception)
|
|
||||||
{
|
|
||||||
m_aLink.Call(nullptr);
|
|
||||||
}
|
|
||||||
|
|
||||||
//XEventListener
|
|
||||||
void SAL_CALL ModifyListenerCallBack_impl::disposing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException, std::exception)
|
|
||||||
{
|
|
||||||
m_xBroadcaster.clear();
|
|
||||||
}
|
|
||||||
|
|
||||||
void ModifyListenerCallBack_impl::stopListening()
|
|
||||||
{
|
|
||||||
if( m_xBroadcaster.is() )
|
|
||||||
{
|
|
||||||
m_xBroadcaster->removeModifyListener( this );
|
|
||||||
m_xBroadcaster.clear();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
ModifyListenerCallBack::ModifyListenerCallBack( const Link<void*,void>& rCallBack )
|
|
||||||
: pModifyListener_impl( new ModifyListenerCallBack_impl(rCallBack) )
|
|
||||||
, m_xModifyListener( pModifyListener_impl )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
ModifyListenerCallBack::~ModifyListenerCallBack()
|
|
||||||
{
|
|
||||||
stopListening();
|
|
||||||
}
|
|
||||||
|
|
||||||
void ModifyListenerCallBack::stopListening()
|
|
||||||
{
|
|
||||||
pModifyListener_impl->stopListening();
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace chart
|
|
||||||
|
|
||||||
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
|
@ -155,7 +155,7 @@ struct AxisProperties final
|
|||||||
TickmarkProperties makeTickmarkPropertiesForComplexCategories( sal_Int32 nTickLength, sal_Int32 nTickStartDistanceToAxis, sal_Int32 nTextLevel ) const;
|
TickmarkProperties makeTickmarkPropertiesForComplexCategories( sal_Int32 nTickLength, sal_Int32 nTickStartDistanceToAxis, sal_Int32 nTextLevel ) const;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
AxisProperties();
|
AxisProperties() = delete;
|
||||||
|
|
||||||
TickmarkProperties makeTickmarkProperties( sal_Int32 nDepth ) const;
|
TickmarkProperties makeTickmarkProperties( sal_Int32 nDepth ) const;
|
||||||
//@todo get this from somewhere; maybe for each subincrement
|
//@todo get this from somewhere; maybe for each subincrement
|
||||||
|
@ -102,14 +102,6 @@ VDataSeriesGroup::CachedYValues::CachedYValues()
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
VDataSeriesGroup::VDataSeriesGroup()
|
|
||||||
: m_aSeriesVector()
|
|
||||||
, m_bMaxPointCountDirty(true)
|
|
||||||
, m_nMaxPointCount(0)
|
|
||||||
, m_aListOfCachedYValues()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
VDataSeriesGroup::VDataSeriesGroup( VDataSeries* pSeries )
|
VDataSeriesGroup::VDataSeriesGroup( VDataSeries* pSeries )
|
||||||
: m_aSeriesVector(1,pSeries)
|
: m_aSeriesVector(1,pSeries)
|
||||||
, m_bMaxPointCountDirty(true)
|
, m_bMaxPointCountDirty(true)
|
||||||
|
@ -76,7 +76,7 @@ private:
|
|||||||
class VDataSeriesGroup final
|
class VDataSeriesGroup final
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
VDataSeriesGroup();
|
VDataSeriesGroup() = delete;
|
||||||
VDataSeriesGroup( VDataSeries* pSeries );
|
VDataSeriesGroup( VDataSeries* pSeries );
|
||||||
~VDataSeriesGroup();
|
~VDataSeriesGroup();
|
||||||
|
|
||||||
|
@ -1172,12 +1172,6 @@ uno::Reference < io::XInputStream > EmbeddedObjectContainer::GetObjectStream( co
|
|||||||
return xInputStream;
|
return xInputStream;
|
||||||
}
|
}
|
||||||
|
|
||||||
uno::Reference < io::XInputStream > EmbeddedObjectContainer::GetObjectStream( const uno::Reference < embed::XEmbeddedObject >& xObj )
|
|
||||||
{
|
|
||||||
// try to load it from the container storage
|
|
||||||
return GetObjectStream( GetEmbeddedObjectName( xObj ), nullptr );
|
|
||||||
}
|
|
||||||
|
|
||||||
bool EmbeddedObjectContainer::InsertGraphicStream( const css::uno::Reference < css::io::XInputStream >& rStream, const OUString& rObjectName, const OUString& rMediaType )
|
bool EmbeddedObjectContainer::InsertGraphicStream( const css::uno::Reference < css::io::XInputStream >& rStream, const OUString& rObjectName, const OUString& rMediaType )
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
|
@ -39,18 +39,6 @@ namespace comphelper { namespace module
|
|||||||
ComphelperModule();
|
ComphelperModule();
|
||||||
};
|
};
|
||||||
|
|
||||||
/* -------------------------------------------------------------------- */
|
|
||||||
class ComphelperModuleClient : public ::comphelper::OModuleClient
|
|
||||||
{
|
|
||||||
private:
|
|
||||||
typedef ::comphelper::OModuleClient BaseClass;
|
|
||||||
|
|
||||||
public:
|
|
||||||
ComphelperModuleClient() : BaseClass( ComphelperModule::getInstance() )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
/* -------------------------------------------------------------------- */
|
/* -------------------------------------------------------------------- */
|
||||||
template < class TYPE >
|
template < class TYPE >
|
||||||
class OAutoRegistration : public ::comphelper::OAutoRegistration< TYPE >
|
class OAutoRegistration : public ::comphelper::OAutoRegistration< TYPE >
|
||||||
|
@ -38,15 +38,8 @@ struct MyCallSiteInfo
|
|||||||
};
|
};
|
||||||
bool operator < (const MyCallSiteInfo &lhs, const MyCallSiteInfo &rhs)
|
bool operator < (const MyCallSiteInfo &lhs, const MyCallSiteInfo &rhs)
|
||||||
{
|
{
|
||||||
if (lhs.sourceLocation < rhs.sourceLocation)
|
return std::tie(lhs.sourceLocation, lhs.paramIndex, lhs.callValue)
|
||||||
return true;
|
< std::tie(rhs.sourceLocation, rhs.paramIndex, rhs.callValue);
|
||||||
else if (lhs.sourceLocation > rhs.sourceLocation)
|
|
||||||
return false;
|
|
||||||
else if (lhs.paramIndex < rhs.paramIndex)
|
|
||||||
return true;
|
|
||||||
else if (lhs.paramIndex > rhs.paramIndex)
|
|
||||||
return false;
|
|
||||||
else return lhs.callValue < rhs.callValue;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -36,7 +36,8 @@ struct MyFuncInfo
|
|||||||
};
|
};
|
||||||
bool operator < (const MyFuncInfo &lhs, const MyFuncInfo &rhs)
|
bool operator < (const MyFuncInfo &lhs, const MyFuncInfo &rhs)
|
||||||
{
|
{
|
||||||
return lhs.sourceLocation < rhs.sourceLocation;
|
return std::tie(lhs.returnType, lhs.nameAndParams)
|
||||||
|
< std::tie(rhs.returnType, rhs.nameAndParams);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -50,12 +50,8 @@ struct MyFieldInfo
|
|||||||
};
|
};
|
||||||
bool operator < (const MyFieldInfo &lhs, const MyFieldInfo &rhs)
|
bool operator < (const MyFieldInfo &lhs, const MyFieldInfo &rhs)
|
||||||
{
|
{
|
||||||
if (lhs.parentClass < rhs.parentClass)
|
return std::tie(lhs.parentClass, lhs.fieldName)
|
||||||
return true;
|
< std::tie(rhs.parentClass, rhs.fieldName);
|
||||||
else if (lhs.parentClass == rhs.parentClass)
|
|
||||||
return lhs.fieldName < rhs.fieldName;
|
|
||||||
else
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -25,12 +25,12 @@ This plugin performs 3 different analyses:
|
|||||||
It does so, by dumping various call/definition/use info to a log file.
|
It does so, by dumping various call/definition/use info to a log file.
|
||||||
Then we will post-process the various lists and find the set of unused methods.
|
Then we will post-process the various lists and find the set of unused methods.
|
||||||
|
|
||||||
Be warned that it produces around 5G of log file.
|
Be warned that it produces around 15G of log file.
|
||||||
|
|
||||||
The process goes something like this:
|
The process goes something like this:
|
||||||
$ make check
|
$ make check
|
||||||
$ make FORCE_COMPILE_ALL=1 COMPILER_PLUGIN_TOOL='unusedmethods' check
|
$ make FORCE_COMPILE_ALL=1 COMPILER_PLUGIN_TOOL='unusedmethods' check
|
||||||
$ ./compilerplugins/clang/unusedmethods.py unusedmethods.log > result.txt
|
$ ./compilerplugins/clang/unusedmethods.py unusedmethods.log
|
||||||
|
|
||||||
and then
|
and then
|
||||||
$ for dir in *; do make FORCE_COMPILE_ALL=1 UPDATE_FILES=$dir COMPILER_PLUGIN_TOOL='unusedmethodsremove' $dir; done
|
$ for dir in *; do make FORCE_COMPILE_ALL=1 UPDATE_FILES=$dir COMPILER_PLUGIN_TOOL='unusedmethodsremove' $dir; done
|
||||||
@ -55,7 +55,8 @@ struct MyFuncInfo
|
|||||||
};
|
};
|
||||||
bool operator < (const MyFuncInfo &lhs, const MyFuncInfo &rhs)
|
bool operator < (const MyFuncInfo &lhs, const MyFuncInfo &rhs)
|
||||||
{
|
{
|
||||||
return lhs.sourceLocation < rhs.sourceLocation;
|
return std::tie(lhs.returnType, lhs.nameAndParams)
|
||||||
|
< std::tie(rhs.returnType, rhs.nameAndParams);
|
||||||
}
|
}
|
||||||
|
|
||||||
// try to limit the voluminous output a little
|
// try to limit the voluminous output a little
|
||||||
@ -102,10 +103,12 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool shouldVisitTemplateInstantiations () const { return true; }
|
bool shouldVisitTemplateInstantiations () const { return true; }
|
||||||
|
bool shouldVisitImplicitCode() const { return true; }
|
||||||
|
|
||||||
bool VisitCallExpr(CallExpr* );
|
bool VisitCallExpr(CallExpr* );
|
||||||
bool VisitFunctionDecl( const FunctionDecl* decl );
|
bool VisitFunctionDecl( const FunctionDecl* decl );
|
||||||
bool VisitDeclRefExpr( const DeclRefExpr* );
|
bool VisitDeclRefExpr( const DeclRefExpr* );
|
||||||
|
bool VisitCXXConstructExpr( const CXXConstructExpr* );
|
||||||
private:
|
private:
|
||||||
void logCallToRootMethods(const FunctionDecl* functionDecl, std::set<MyFuncInfo>& funcSet);
|
void logCallToRootMethods(const FunctionDecl* functionDecl, std::set<MyFuncInfo>& funcSet);
|
||||||
MyFuncInfo niceName(const FunctionDecl* functionDecl);
|
MyFuncInfo niceName(const FunctionDecl* functionDecl);
|
||||||
@ -132,7 +135,11 @@ MyFuncInfo UnusedMethods::niceName(const FunctionDecl* functionDecl)
|
|||||||
case AS_protected: aInfo.access = "protected"; break;
|
case AS_protected: aInfo.access = "protected"; break;
|
||||||
default: aInfo.access = "unknown"; break;
|
default: aInfo.access = "unknown"; break;
|
||||||
}
|
}
|
||||||
|
if (!isa<CXXConstructorDecl>(functionDecl)) {
|
||||||
aInfo.returnType = compat::getReturnType(*functionDecl).getCanonicalType().getAsString();
|
aInfo.returnType = compat::getReturnType(*functionDecl).getCanonicalType().getAsString();
|
||||||
|
} else {
|
||||||
|
aInfo.returnType = "";
|
||||||
|
}
|
||||||
|
|
||||||
if (isa<CXXMethodDecl>(functionDecl)) {
|
if (isa<CXXMethodDecl>(functionDecl)) {
|
||||||
const CXXRecordDecl* recordDecl = dyn_cast<CXXMethodDecl>(functionDecl)->getParent();
|
const CXXRecordDecl* recordDecl = dyn_cast<CXXMethodDecl>(functionDecl)->getParent();
|
||||||
@ -308,6 +315,19 @@ gotfunc:
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool UnusedMethods::VisitCXXConstructExpr( const CXXConstructExpr* constructExpr )
|
||||||
|
{
|
||||||
|
// 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
|
||||||
|
|
||||||
|
const CXXConstructorDecl* constructorDecl = constructExpr->getConstructor();
|
||||||
|
constructorDecl = constructorDecl->getCanonicalDecl();
|
||||||
|
|
||||||
|
logCallToRootMethods(constructorDecl, callSet);
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
bool UnusedMethods::VisitFunctionDecl( const FunctionDecl* functionDecl )
|
bool UnusedMethods::VisitFunctionDecl( const FunctionDecl* functionDecl )
|
||||||
{
|
{
|
||||||
functionDecl = functionDecl->getCanonicalDecl();
|
functionDecl = functionDecl->getCanonicalDecl();
|
||||||
@ -325,10 +345,7 @@ bool UnusedMethods::VisitFunctionDecl( const FunctionDecl* functionDecl )
|
|||||||
if (isa<CXXDestructorDecl>(functionDecl)) {
|
if (isa<CXXDestructorDecl>(functionDecl)) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if (isa<CXXConstructorDecl>(functionDecl)) {
|
if (functionDecl->isDeleted() || functionDecl->isDefaulted()) {
|
||||||
return true;
|
|
||||||
}
|
|
||||||
if (functionDecl && functionDecl->isDeleted()) {
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -32,8 +32,7 @@ class NodeMap
|
|||||||
{
|
{
|
||||||
NodeMapImpl maImpl;
|
NodeMapImpl maImpl;
|
||||||
|
|
||||||
NodeMap(const NodeMap &rMap) :
|
NodeMap(const NodeMap &rMap) = delete;
|
||||||
maImpl(rMap.maImpl) { clearCache(); }
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
typedef NodeMapImpl::iterator iterator;
|
typedef NodeMapImpl::iterator iterator;
|
||||||
|
@ -56,7 +56,6 @@ namespace connectivity
|
|||||||
protected:
|
protected:
|
||||||
node_type m_eNodeType;
|
node_type m_eNodeType;
|
||||||
|
|
||||||
MQueryExpressionBase() : m_eNodeType( Unknown ) {}
|
|
||||||
explicit MQueryExpressionBase( node_type _eNodeType ) : m_eNodeType( _eNodeType ) {}
|
explicit MQueryExpressionBase( node_type _eNodeType ) : m_eNodeType( _eNodeType ) {}
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
@ -30,14 +30,6 @@ struct ini_NameValue
|
|||||||
{
|
{
|
||||||
OUString sName;
|
OUString sName;
|
||||||
OUString sValue;
|
OUString sValue;
|
||||||
|
|
||||||
inline ini_NameValue()
|
|
||||||
{}
|
|
||||||
inline ini_NameValue(
|
|
||||||
OUString const & name, OUString const & value )
|
|
||||||
: sName( name ),
|
|
||||||
sValue( value )
|
|
||||||
{}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
typedef std::list<
|
typedef std::list<
|
||||||
|
@ -62,7 +62,6 @@ typedef std::shared_ptr< ExpressionNode > ExpressionNodeSharedPtr;
|
|||||||
*/
|
*/
|
||||||
struct OOO_DLLPUBLIC_DBTOOLS ParseError
|
struct OOO_DLLPUBLIC_DBTOOLS ParseError
|
||||||
{
|
{
|
||||||
ParseError() {}
|
|
||||||
ParseError( const char* ) {}
|
ParseError( const char* ) {}
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -108,8 +107,7 @@ public:
|
|||||||
private:
|
private:
|
||||||
// disabled constructor/destructor, since this is
|
// disabled constructor/destructor, since this is
|
||||||
// supposed to be a singleton
|
// supposed to be a singleton
|
||||||
FunctionParser();
|
FunctionParser() = delete;
|
||||||
|
|
||||||
FunctionParser(const FunctionParser&) = delete;
|
FunctionParser(const FunctionParser&) = delete;
|
||||||
FunctionParser& operator=( const FunctionParser& ) = delete;
|
FunctionParser& operator=( const FunctionParser& ) = delete;
|
||||||
};
|
};
|
||||||
|
@ -108,9 +108,6 @@ namespace connectivity
|
|||||||
OKeySet()
|
OKeySet()
|
||||||
: ORefVector<sal_Int32>()
|
: ORefVector<sal_Int32>()
|
||||||
, m_bFrozen(false){}
|
, m_bFrozen(false){}
|
||||||
OKeySet(Vector::size_type _nSize)
|
|
||||||
: ORefVector<sal_Int32>(_nSize)
|
|
||||||
, m_bFrozen(false){}
|
|
||||||
|
|
||||||
bool isFrozen() const { return m_bFrozen; }
|
bool isFrozen() const { return m_bFrozen; }
|
||||||
void setFrozen() { m_bFrozen = true; }
|
void setFrozen() { m_bFrozen = true; }
|
||||||
|
@ -141,8 +141,6 @@ namespace connectivity
|
|||||||
class OOperandResult : public OOperandValue
|
class OOperandResult : public OOperandValue
|
||||||
{
|
{
|
||||||
protected:
|
protected:
|
||||||
OOperandResult(const ORowSetValue& _rVar, sal_Int32 eDbType)
|
|
||||||
:OOperandValue(_rVar, eDbType) {}
|
|
||||||
OOperandResult(sal_Int32 eDbType)
|
OOperandResult(sal_Int32 eDbType)
|
||||||
:OOperandValue(eDbType) {}
|
:OOperandValue(eDbType) {}
|
||||||
public:
|
public:
|
||||||
|
@ -34,7 +34,6 @@ namespace connectivity
|
|||||||
OUString m_sString;
|
OUString m_sString;
|
||||||
public:
|
public:
|
||||||
QuotedTokenizedString() {}
|
QuotedTokenizedString() {}
|
||||||
QuotedTokenizedString(const OUString& _sString) : m_sString(_sString){}
|
|
||||||
|
|
||||||
sal_Int32 GetTokenCount( sal_Unicode cTok , sal_Unicode cStrDel ) const;
|
sal_Int32 GetTokenCount( sal_Unicode cTok , sal_Unicode cStrDel ) const;
|
||||||
OUString GetTokenSpecial(sal_Int32& nStartPos, sal_Unicode cTok = ';', sal_Unicode cStrDel = '\0') const;
|
OUString GetTokenSpecial(sal_Int32& nStartPos, sal_Unicode cTok = ';', sal_Unicode cStrDel = '\0') const;
|
||||||
|
@ -32,8 +32,6 @@ namespace connectivity
|
|||||||
public:
|
public:
|
||||||
virtual jclass getMyClass() const override;
|
virtual jclass getMyClass() const override;
|
||||||
virtual ~java_math_BigDecimal();
|
virtual ~java_math_BigDecimal();
|
||||||
// a Constructor, that is needed for when Returning the Object is needed:
|
|
||||||
java_math_BigDecimal( JNIEnv * pEnv, jobject myObj ) : java_lang_Object( pEnv, myObj ){}
|
|
||||||
|
|
||||||
java_math_BigDecimal( const OUString& _par0 );
|
java_math_BigDecimal( const OUString& _par0 );
|
||||||
java_math_BigDecimal( const double& _par0 );
|
java_math_BigDecimal( const double& _par0 );
|
||||||
|
@ -37,8 +37,6 @@ namespace connectivity
|
|||||||
public:
|
public:
|
||||||
virtual jclass getMyClass() const override;
|
virtual jclass getMyClass() const override;
|
||||||
virtual ~java_sql_DriverPropertyInfo();
|
virtual ~java_sql_DriverPropertyInfo();
|
||||||
// A ctor that is needed for returning the object
|
|
||||||
java_sql_DriverPropertyInfo( JNIEnv * pEnv, jobject myObj ) : java_lang_Object( pEnv, myObj ){}
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -31,7 +31,6 @@ namespace connectivity
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
// A ctor that is needed for returning the object
|
// A ctor that is needed for returning the object
|
||||||
java_sql_SQLException(){}
|
|
||||||
java_sql_SQLException( const java_sql_SQLException_BASE& _rException,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> & _rContext);
|
java_sql_SQLException( const java_sql_SQLException_BASE& _rException,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> & _rContext);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -31,8 +31,6 @@ namespace connectivity
|
|||||||
public:
|
public:
|
||||||
virtual jclass getMyClass() const override;
|
virtual jclass getMyClass() const override;
|
||||||
virtual ~java_util_Properties();
|
virtual ~java_util_Properties();
|
||||||
// A ctor that is needed for returning the object
|
|
||||||
java_util_Properties( JNIEnv * pEnv, jobject myObj ) : java_lang_Object( pEnv, myObj ){}
|
|
||||||
java_util_Properties( );
|
java_util_Properties( );
|
||||||
void setProperty(const OUString& key, const OUString& value);
|
void setProperty(const OUString& key, const OUString& value);
|
||||||
};
|
};
|
||||||
|
@ -44,9 +44,6 @@ struct SpellErrorDescription
|
|||||||
css::uno::Sequence< OUString > aSuggestions;
|
css::uno::Sequence< OUString > aSuggestions;
|
||||||
OUString sRuleId;
|
OUString sRuleId;
|
||||||
|
|
||||||
SpellErrorDescription() :
|
|
||||||
bIsGrammarError( false ){}
|
|
||||||
|
|
||||||
SpellErrorDescription( bool bGrammar,
|
SpellErrorDescription( bool bGrammar,
|
||||||
const OUString& rText,
|
const OUString& rText,
|
||||||
const css::lang::Locale& rLocale,
|
const css::lang::Locale& rLocale,
|
||||||
@ -99,8 +96,7 @@ public:
|
|||||||
private:
|
private:
|
||||||
SpellErrorDescription m_aSpellErrorDescription;
|
SpellErrorDescription m_aSpellErrorDescription;
|
||||||
|
|
||||||
//not accessible
|
SpellErrorAttrib() = delete;
|
||||||
SpellErrorAttrib();
|
|
||||||
public:
|
public:
|
||||||
SpellErrorAttrib( const SpellErrorDescription& );
|
SpellErrorAttrib( const SpellErrorDescription& );
|
||||||
SpellErrorAttrib( const SpellErrorAttrib& rAttr );
|
SpellErrorAttrib( const SpellErrorAttrib& rAttr );
|
||||||
@ -119,8 +115,7 @@ class SpellLanguageAttrib : public TextAttrib
|
|||||||
{
|
{
|
||||||
LanguageType m_eLanguage;
|
LanguageType m_eLanguage;
|
||||||
|
|
||||||
//not accessible
|
SpellLanguageAttrib() = delete;
|
||||||
SpellLanguageAttrib();
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
SpellLanguageAttrib(LanguageType eLanguage);
|
SpellLanguageAttrib(LanguageType eLanguage);
|
||||||
@ -139,8 +134,7 @@ class SpellBackgroundAttrib : public TextAttrib
|
|||||||
{
|
{
|
||||||
Color m_aBackgroundColor;
|
Color m_aBackgroundColor;
|
||||||
|
|
||||||
//not accessible
|
SpellBackgroundAttrib() = delete;
|
||||||
SpellBackgroundAttrib();
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
SpellBackgroundAttrib(const Color& rCol);
|
SpellBackgroundAttrib(const Color& rCol);
|
||||||
|
@ -191,13 +191,6 @@ class AutoCorrEdit : public Edit
|
|||||||
void dispose() override;
|
void dispose() override;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
AutoCorrEdit(vcl::Window* pParent, const ResId& rResId)
|
|
||||||
: Edit(pParent, rResId)
|
|
||||||
, m_nCol(0)
|
|
||||||
, bSpaces(false)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
AutoCorrEdit(vcl::Window* pParent)
|
AutoCorrEdit(vcl::Window* pParent)
|
||||||
: Edit(pParent)
|
: Edit(pParent)
|
||||||
, m_nCol(0)
|
, m_nCol(0)
|
||||||
|
@ -88,7 +88,6 @@ public:
|
|||||||
void SetReadOnlyMode( bool bReadOnly );
|
void SetReadOnlyMode( bool bReadOnly );
|
||||||
inline bool IsHTMLDoc() const { return mbIsHTMLDoc; }
|
inline bool IsHTMLDoc() const { return mbIsHTMLDoc; }
|
||||||
|
|
||||||
inline SfxBindings* GetBindings() const { return mpBindings; };
|
|
||||||
inline SfxDispatcher* GetDispatcher() const { return mpBindings->GetDispatcher(); }
|
inline SfxDispatcher* GetDispatcher() const { return mpBindings->GetDispatcher(); }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -94,19 +94,6 @@ public:
|
|||||||
css::uno::Reference< css::io::XInputStream > GetIconIfIconified( OUString* pGraphicMediaType ) override;
|
css::uno::Reference< css::io::XInputStream > GetIconIfIconified( OUString* pGraphicMediaType ) override;
|
||||||
};
|
};
|
||||||
|
|
||||||
class SvInsertPlugInDialog : public InsertObjectDialog_Impl
|
|
||||||
{
|
|
||||||
private:
|
|
||||||
DECL_LINK_TYPED(BrowseHdl, Button*, void);
|
|
||||||
|
|
||||||
public:
|
|
||||||
SvInsertPlugInDialog(vcl::Window* pParent,
|
|
||||||
const css::uno::Reference < css::embed::XStorage >& xStorage);
|
|
||||||
virtual ~SvInsertPlugInDialog();
|
|
||||||
virtual void dispose() override;
|
|
||||||
virtual short Execute() override;
|
|
||||||
};
|
|
||||||
|
|
||||||
class SfxInsertFloatingFrameDialog : public InsertObjectDialog_Impl
|
class SfxInsertFloatingFrameDialog : public InsertObjectDialog_Impl
|
||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
|
@ -42,7 +42,6 @@ struct EventDisplayName
|
|||||||
{
|
{
|
||||||
const sal_Char* pAsciiEventName;
|
const sal_Char* pAsciiEventName;
|
||||||
sal_uInt16 nEventResourceID;
|
sal_uInt16 nEventResourceID;
|
||||||
EventDisplayName() : pAsciiEventName( nullptr ), nEventResourceID(0) { }
|
|
||||||
EventDisplayName( const sal_Char* _pAsciiName, const sal_uInt16 _nResId )
|
EventDisplayName( const sal_Char* _pAsciiName, const sal_uInt16 _nResId )
|
||||||
: pAsciiEventName( _pAsciiName )
|
: pAsciiEventName( _pAsciiName )
|
||||||
, nEventResourceID( _nResId )
|
, nEventResourceID( _nResId )
|
||||||
|
@ -78,8 +78,6 @@ class SvxDictEdit : public Edit
|
|||||||
bool bSpaces;
|
bool bSpaces;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
SvxDictEdit(vcl::Window* pParent, const ResId& rResId) :
|
|
||||||
Edit(pParent, rResId), bSpaces(false){}
|
|
||||||
SvxDictEdit(vcl::Window* pParent, WinBits aWB) :
|
SvxDictEdit(vcl::Window* pParent, WinBits aWB) :
|
||||||
Edit(pParent, aWB), bSpaces(false){}
|
Edit(pParent, aWB), bSpaces(false){}
|
||||||
|
|
||||||
|
@ -117,9 +117,7 @@ private:
|
|||||||
bool loaded;
|
bool loaded;
|
||||||
css::uno::Reference< css::script::browse::XBrowseNode > nodes;
|
css::uno::Reference< css::script::browse::XBrowseNode > nodes;
|
||||||
css::uno::Reference< css::frame::XModel > model;
|
css::uno::Reference< css::frame::XModel > model;
|
||||||
SFEntry(){}
|
|
||||||
public:
|
public:
|
||||||
SFEntry( sal_uInt8 nT ) { nType = nT; loaded=false; }
|
|
||||||
SFEntry( sal_uInt8 nT,
|
SFEntry( sal_uInt8 nT,
|
||||||
const css::uno::Reference< css::script::browse::XBrowseNode >& entryNodes ,
|
const css::uno::Reference< css::script::browse::XBrowseNode >& entryNodes ,
|
||||||
const css::uno::Reference< css::frame::XModel >& entryModel) { nType = nT; nodes = entryNodes; loaded=false; model = entryModel; }
|
const css::uno::Reference< css::frame::XModel >& entryModel) { nType = nT; nodes = entryNodes; loaded=false; model = entryModel; }
|
||||||
|
@ -551,40 +551,6 @@ IMPL_STATIC_LINK_TYPED( SvxProxyTabPage, LoseFocusHdl_Impl, Control&, rControl,
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void SvxScriptExecListBox::RequestHelp( const HelpEvent& rHEvt )
|
|
||||||
{ // try to show tips just like as on toolbars
|
|
||||||
sal_Int32 nPos=LISTBOX_ENTRY_NOTFOUND;
|
|
||||||
sal_Int32 nTop = GetTopEntry();
|
|
||||||
sal_uInt16 nCount = GetDisplayLineCount(); // Attention: Not GetLineCount()
|
|
||||||
Point aPt = ScreenToOutputPixel( rHEvt.GetMousePosPixel() );
|
|
||||||
Rectangle aItemRect;
|
|
||||||
if( nCount > 0 ) // if there're some entries, find it.
|
|
||||||
for( nPos = nTop ; nPos <= nTop+nCount-1 ; nPos++ ) {
|
|
||||||
aItemRect = GetBoundingRectangle(nPos);
|
|
||||||
if( aPt.Y() < aItemRect.Top() || aPt.Y() > aItemRect.Bottom() )
|
|
||||||
continue;
|
|
||||||
else
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
else // if not, nothing happens.
|
|
||||||
return;
|
|
||||||
OUString aHelpText;
|
|
||||||
if( nPos <= nTop+nCount-1 ) // if find the matching entry, get its content.
|
|
||||||
aHelpText = GetEntry(nPos);
|
|
||||||
if( aHelpText.getLength() && GetTextWidth(aHelpText)<GetOutputSizePixel().Width() )
|
|
||||||
aHelpText.clear(); // if the entry is quite short, clear the helping tip content.
|
|
||||||
aItemRect = Rectangle(Point(0,0),GetSizePixel());
|
|
||||||
aPt = Point(OutputToScreenPixel( aItemRect.TopLeft() ));
|
|
||||||
aItemRect.Left() = aPt.X();
|
|
||||||
aItemRect.Top() = aPt.Y();
|
|
||||||
aPt = OutputToScreenPixel( aItemRect.BottomRight() );
|
|
||||||
aItemRect.Right() = aPt.X();
|
|
||||||
aItemRect.Bottom() = aPt.Y();
|
|
||||||
if( rHEvt.GetMode() == HelpEventMode::BALLOON )
|
|
||||||
Help::ShowBalloon( this, aItemRect.Center(), aItemRect, aHelpText);
|
|
||||||
else
|
|
||||||
Help::ShowQuickHelp( this, aItemRect, aHelpText );
|
|
||||||
}
|
|
||||||
|
|
||||||
/********************************************************************/
|
/********************************************************************/
|
||||||
/* */
|
/* */
|
||||||
|
@ -98,19 +98,6 @@ public:
|
|||||||
virtual void Reset( const SfxItemSet* rSet ) override;
|
virtual void Reset( const SfxItemSet* rSet ) override;
|
||||||
};
|
};
|
||||||
|
|
||||||
// #98647# class SvxScriptExecListBox ------------------------------------
|
|
||||||
class SvxScriptExecListBox : public ListBox
|
|
||||||
{ // for adding tooltips to ListBox
|
|
||||||
public:
|
|
||||||
SvxScriptExecListBox( vcl::Window* pParent, WinBits nStyle = WB_BORDER )
|
|
||||||
:ListBox(pParent, nStyle) {}
|
|
||||||
SvxScriptExecListBox( vcl::Window* pParent, const ResId& rResId )
|
|
||||||
:ListBox(pParent, rResId) {}
|
|
||||||
|
|
||||||
protected:
|
|
||||||
virtual void RequestHelp( const HelpEvent& rHEvt ) override;
|
|
||||||
};
|
|
||||||
|
|
||||||
// class SvxSecurityTabPage ---------------------------------------------
|
// class SvxSecurityTabPage ---------------------------------------------
|
||||||
|
|
||||||
class SvtSecurityOptions;
|
class SvtSecurityOptions;
|
||||||
|
@ -148,9 +148,6 @@ private:
|
|||||||
m_pAssignedList->GetSelectEntryPos()
|
m_pAssignedList->GetSelectEntryPos()
|
||||||
!= LISTBOX_ENTRY_NOTFOUND ); }
|
!= LISTBOX_ENTRY_NOTFOUND ); }
|
||||||
|
|
||||||
inline void EnableAssignButton()
|
|
||||||
{ m_pAssignBtn->Enable(); }
|
|
||||||
|
|
||||||
inline void DisableAssignButton()
|
inline void DisableAssignButton()
|
||||||
{ m_pAssignBtn->Disable(); }
|
{ m_pAssignBtn->Disable(); }
|
||||||
|
|
||||||
|
@ -38,7 +38,6 @@ namespace dbaccess
|
|||||||
ORowSetOldRowHelper& operator=(const ORowSetOldRowHelper& _rRH) = delete;
|
ORowSetOldRowHelper& operator=(const ORowSetOldRowHelper& _rRH) = delete;
|
||||||
ORowSetOldRowHelper(const ORowSetOldRowHelper& _rRh) = delete;
|
ORowSetOldRowHelper(const ORowSetOldRowHelper& _rRh) = delete;
|
||||||
public:
|
public:
|
||||||
ORowSetOldRowHelper(){}
|
|
||||||
explicit ORowSetOldRowHelper(const ORowSetRow& _rRow)
|
explicit ORowSetOldRowHelper(const ORowSetRow& _rRow)
|
||||||
: m_aRow(_rRow)
|
: m_aRow(_rRow)
|
||||||
{}
|
{}
|
||||||
|
@ -111,21 +111,6 @@ ODataSettings_Base::ODataSettings_Base()
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
ODataSettings_Base::ODataSettings_Base(const ODataSettings_Base& _rSource)
|
|
||||||
:m_sFilter( _rSource.m_sFilter )
|
|
||||||
,m_sHavingClause( _rSource.m_sHavingClause )
|
|
||||||
,m_sGroupBy( _rSource.m_sGroupBy )
|
|
||||||
,m_sOrder( _rSource.m_sOrder )
|
|
||||||
,m_bApplyFilter( _rSource.m_bApplyFilter )
|
|
||||||
,m_aFont( _rSource.m_aFont )
|
|
||||||
,m_aRowHeight( _rSource.m_aRowHeight )
|
|
||||||
,m_aTextColor( _rSource.m_aTextColor )
|
|
||||||
,m_aTextLineColor( _rSource.m_aTextLineColor )
|
|
||||||
,m_nFontEmphasis( _rSource.m_nFontEmphasis )
|
|
||||||
,m_nFontRelief( _rSource.m_nFontRelief )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
ODataSettings_Base::~ODataSettings_Base()
|
ODataSettings_Base::~ODataSettings_Base()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
@ -44,7 +44,7 @@ namespace dbaccess
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
// no instantiation allowed
|
// no instantiation allowed
|
||||||
ResourceManager() { }
|
ResourceManager() = delete;
|
||||||
~ResourceManager() { }
|
~ResourceManager() { }
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
@ -52,7 +52,7 @@ public:
|
|||||||
|
|
||||||
protected:
|
protected:
|
||||||
ODataSettings_Base();
|
ODataSettings_Base();
|
||||||
ODataSettings_Base(const ODataSettings_Base& _rSource);
|
ODataSettings_Base(const ODataSettings_Base& _rSource) = delete;
|
||||||
~ODataSettings_Base();
|
~ODataSettings_Base();
|
||||||
};
|
};
|
||||||
// ODataSettings - a base class which implements the property handling
|
// ODataSettings - a base class which implements the property handling
|
||||||
|
@ -54,12 +54,6 @@ namespace dbaccess
|
|||||||
,bForEditing( false )
|
,bForEditing( false )
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
SubComponentDescriptor( const OUString& i_rName, const bool i_bForEditing )
|
|
||||||
:sName( i_rName )
|
|
||||||
,bForEditing( i_bForEditing )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
typedef std::unordered_map< OUString, SubComponentDescriptor, OUStringHash > MapStringToCompDesc;
|
typedef std::unordered_map< OUString, SubComponentDescriptor, OUStringHash > MapStringToCompDesc;
|
||||||
|
@ -65,12 +65,6 @@ namespace dbmm
|
|||||||
::std::vector< OUString > aErrorDetails;
|
::std::vector< OUString > aErrorDetails;
|
||||||
const css::uno::Any aCaughtException;
|
const css::uno::Any aCaughtException;
|
||||||
|
|
||||||
explicit MigrationError(
|
|
||||||
const MigrationErrorType _eType )
|
|
||||||
:eType( _eType )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
MigrationError(
|
MigrationError(
|
||||||
const MigrationErrorType _eType,
|
const MigrationErrorType _eType,
|
||||||
const css::uno::Any& _rCaughtException )
|
const css::uno::Any& _rCaughtException )
|
||||||
|
@ -156,8 +156,7 @@ class ODBExport : public SvXMLExport
|
|||||||
|
|
||||||
rtl::Reference < XMLPropertySetMapper > GetTableStylesPropertySetMapper() const;
|
rtl::Reference < XMLPropertySetMapper > GetTableStylesPropertySetMapper() const;
|
||||||
|
|
||||||
private:
|
ODBExport() = delete;
|
||||||
ODBExport();
|
|
||||||
protected:
|
protected:
|
||||||
|
|
||||||
virtual void ExportStyles_( bool bUsed ) override;
|
virtual void ExportStyles_( bool bUsed ) override;
|
||||||
|
@ -42,8 +42,6 @@ namespace dbaui
|
|||||||
// OTextConnectionPage
|
// OTextConnectionPage
|
||||||
class OTextConnectionHelper : public TabPage
|
class OTextConnectionHelper : public TabPage
|
||||||
{
|
{
|
||||||
OTextConnectionHelper();
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
OTextConnectionHelper( vcl::Window* pParent, const short _nAvailableSections );
|
OTextConnectionHelper( vcl::Window* pParent, const short _nAvailableSections );
|
||||||
virtual ~OTextConnectionHelper();
|
virtual ~OTextConnectionHelper();
|
||||||
|
@ -60,7 +60,6 @@ private:
|
|||||||
TableIndexList aIndexList;
|
TableIndexList aIndexList;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
OTableInfo() { }
|
|
||||||
explicit OTableInfo( const OUString& rName ) : aTableName(rName) { }
|
explicit OTableInfo( const OUString& rName ) : aTableName(rName) { }
|
||||||
|
|
||||||
void WriteInfFile( const OUString& rDSN ) const;
|
void WriteInfFile( const OUString& rDSN ) const;
|
||||||
|
@ -240,13 +240,6 @@ namespace dbaui
|
|||||||
DECL_LINK_TYPED( OnCheckBoxClick, Button*, void );
|
DECL_LINK_TYPED( OnCheckBoxClick, Button*, void );
|
||||||
};
|
};
|
||||||
|
|
||||||
// OMozillaDetailsPage Detail page for Mozilla and Thunderbird addressbook
|
|
||||||
class OMozillaDetailsPage : public OCommonBehaviourTabPage
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
OMozillaDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs );
|
|
||||||
};
|
|
||||||
|
|
||||||
// OTextDetailsPage
|
// OTextDetailsPage
|
||||||
class OTextDetailsPage : public OCommonBehaviourTabPage
|
class OTextDetailsPage : public OCommonBehaviourTabPage
|
||||||
{
|
{
|
||||||
|
@ -56,11 +56,6 @@ namespace dbaui
|
|||||||
,OSQLNameChecker(_rAllowedChars)
|
,OSQLNameChecker(_rAllowedChars)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
OSQLNameEdit(vcl::Window* _pParent,const ResId& _rRes,const OUString& _rAllowedChars = OUString())
|
|
||||||
: Edit(_pParent,_rRes)
|
|
||||||
,OSQLNameChecker(_rAllowedChars)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
// Window overrides
|
// Window overrides
|
||||||
// virtual bool PreNotify( NotifyEvent& rNEvt );
|
// virtual bool PreNotify( NotifyEvent& rNEvt );
|
||||||
@ -77,11 +72,6 @@ namespace dbaui
|
|||||||
, OSQLNameChecker(_rAllowedChars)
|
, OSQLNameChecker(_rAllowedChars)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
OSQLNameComboBox(vcl::Window* _pParent,const ResId& _rRes,const OUString& _rAllowedChars = OUString())
|
|
||||||
: ComboBox(_pParent,_rRes)
|
|
||||||
, OSQLNameChecker(_rAllowedChars)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
// Window overrides
|
// Window overrides
|
||||||
// Edit
|
// Edit
|
||||||
|
@ -212,12 +212,6 @@ namespace dbaui
|
|||||||
const css::uno::Reference< css::uno::XComponentContext >& _rM,
|
const css::uno::Reference< css::uno::XComponentContext >& _rM,
|
||||||
const OUString& rExchange = OUString());
|
const OUString& rExchange = OUString());
|
||||||
|
|
||||||
// import data
|
|
||||||
ORowSetImportExport(const SharedConnection& _rxConnection,
|
|
||||||
const css::uno::Reference< css::uno::XComponentContext >& _rM)
|
|
||||||
: ODatabaseImportExport(_rxConnection,nullptr,_rM)
|
|
||||||
{}
|
|
||||||
|
|
||||||
virtual bool Write() override;
|
virtual bool Write() override;
|
||||||
virtual bool Read() override;
|
virtual bool Read() override;
|
||||||
|
|
||||||
|
@ -66,9 +66,6 @@ namespace dbaui
|
|||||||
const OUString& _rObjectName,
|
const OUString& _rObjectName,
|
||||||
::dbtools::SQLExceptionInfo& _out_rErrorToDisplay
|
::dbtools::SQLExceptionInfo& _out_rErrorToDisplay
|
||||||
) const override;
|
) const override;
|
||||||
|
|
||||||
private:
|
|
||||||
HierarchicalNameCheck(); // never implemented
|
|
||||||
};
|
};
|
||||||
|
|
||||||
// DynamicTableOrQueryNameCheck
|
// DynamicTableOrQueryNameCheck
|
||||||
@ -118,9 +115,6 @@ namespace dbaui
|
|||||||
const OUString& _rObjectName,
|
const OUString& _rObjectName,
|
||||||
::dbtools::SQLExceptionInfo& _out_rErrorToDisplay
|
::dbtools::SQLExceptionInfo& _out_rErrorToDisplay
|
||||||
) const override;
|
) const override;
|
||||||
|
|
||||||
private:
|
|
||||||
DynamicTableOrQueryNameCheck(); // never implemented
|
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace dbaui
|
} // namespace dbaui
|
||||||
|
@ -73,9 +73,6 @@ namespace dbaui
|
|||||||
bool isNew() const { return getOriginalName().isEmpty(); }
|
bool isNew() const { return getOriginalName().isEmpty(); }
|
||||||
void flagAsNew(const GrantIndexAccess&) { sOriginalName.clear(); }
|
void flagAsNew(const GrantIndexAccess&) { sOriginalName.clear(); }
|
||||||
void flagAsCommitted(const GrantIndexAccess&) { sOriginalName = sName; }
|
void flagAsCommitted(const GrantIndexAccess&) { sOriginalName = sName; }
|
||||||
|
|
||||||
private:
|
|
||||||
OIndex(); // not implemented
|
|
||||||
};
|
};
|
||||||
|
|
||||||
typedef std::vector<OIndex> Indexes;
|
typedef std::vector<OIndex> Indexes;
|
||||||
|
@ -29,55 +29,6 @@
|
|||||||
|
|
||||||
namespace dbaui
|
namespace dbaui
|
||||||
{
|
{
|
||||||
class ORowUpdateHelper : public IUpdateHelper
|
|
||||||
{
|
|
||||||
css::uno::Reference< css::sdbc::XRowUpdate > m_xRowUpdate;
|
|
||||||
css::uno::Reference< css::sdbc::XResultSetUpdate > m_xResultSetUpdate;
|
|
||||||
public:
|
|
||||||
explicit ORowUpdateHelper(const css::uno::Reference< css::sdbc::XRowSet>& _xRowSet)
|
|
||||||
:m_xRowUpdate(_xRowSet,css::uno::UNO_QUERY)
|
|
||||||
,m_xResultSetUpdate(_xRowSet,css::uno::UNO_QUERY)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
virtual ~ORowUpdateHelper() {}
|
|
||||||
virtual void updateString(sal_Int32 _nPos, const OUString& _sValue) override
|
|
||||||
{
|
|
||||||
m_xRowUpdate->updateString(_nPos, _sValue);
|
|
||||||
}
|
|
||||||
virtual void updateDouble(sal_Int32 _nPos,const double& _nValue) override
|
|
||||||
{
|
|
||||||
m_xRowUpdate->updateDouble(_nPos, _nValue);
|
|
||||||
}
|
|
||||||
virtual void updateDate(sal_Int32 _nPos,const css::util::Date& _nValue) override
|
|
||||||
{
|
|
||||||
m_xRowUpdate->updateDate(_nPos, _nValue);
|
|
||||||
}
|
|
||||||
virtual void updateTime(sal_Int32 _nPos,const css::util::Time& _nValue) override
|
|
||||||
{
|
|
||||||
m_xRowUpdate->updateTime(_nPos, _nValue);
|
|
||||||
}
|
|
||||||
virtual void updateTimestamp(sal_Int32 _nPos,const css::util::DateTime& _nValue) override
|
|
||||||
{
|
|
||||||
m_xRowUpdate->updateTimestamp(_nPos, _nValue);
|
|
||||||
}
|
|
||||||
virtual void updateInt(sal_Int32 _nPos, sal_Int32 _nValue) override
|
|
||||||
{
|
|
||||||
m_xRowUpdate->updateInt(_nPos, _nValue);
|
|
||||||
}
|
|
||||||
virtual void updateNull(sal_Int32 _nPos, ::sal_Int32) override
|
|
||||||
{
|
|
||||||
m_xRowUpdate->updateNull(_nPos);
|
|
||||||
}
|
|
||||||
virtual void moveToInsertRow() override
|
|
||||||
{
|
|
||||||
m_xResultSetUpdate->moveToInsertRow();
|
|
||||||
}
|
|
||||||
virtual void insertRow() override
|
|
||||||
{
|
|
||||||
m_xResultSetUpdate->insertRow();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
class OParameterUpdateHelper : public IUpdateHelper
|
class OParameterUpdateHelper : public IUpdateHelper
|
||||||
{
|
{
|
||||||
css::uno::Reference< css::sdbc::XPreparedStatement > m_xPrepared;
|
css::uno::Reference< css::sdbc::XPreparedStatement > m_xPrepared;
|
||||||
|
@ -87,7 +87,6 @@ private:
|
|||||||
OUString m_repository;
|
OUString m_repository;
|
||||||
bool m_bSuppressLicense;
|
bool m_bSuppressLicense;
|
||||||
public:
|
public:
|
||||||
LicenseCommandEnv() : m_bSuppressLicense(false) {};
|
|
||||||
LicenseCommandEnv(
|
LicenseCommandEnv(
|
||||||
css::uno::Reference< css::task::XInteractionHandler> const & handler,
|
css::uno::Reference< css::task::XInteractionHandler> const & handler,
|
||||||
bool bSuppressLicense,
|
bool bSuppressLicense,
|
||||||
@ -108,7 +107,6 @@ class NoLicenseCommandEnv : public BaseCommandEnv
|
|||||||
{
|
{
|
||||||
|
|
||||||
public:
|
public:
|
||||||
NoLicenseCommandEnv(){};
|
|
||||||
explicit NoLicenseCommandEnv(css::uno::Reference< css::task::XInteractionHandler> const & handler);
|
explicit NoLicenseCommandEnv(css::uno::Reference< css::task::XInteractionHandler> const & handler);
|
||||||
|
|
||||||
// XInteractionHandler
|
// XInteractionHandler
|
||||||
|
@ -104,11 +104,6 @@ namespace drawinglayer
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
FillGraphicAttribute::FillGraphicAttribute()
|
|
||||||
: mpFillGraphicAttribute(theGlobalDefault::get())
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
FillGraphicAttribute::FillGraphicAttribute(const FillGraphicAttribute& rCandidate)
|
FillGraphicAttribute::FillGraphicAttribute(const FillGraphicAttribute& rCandidate)
|
||||||
: mpFillGraphicAttribute(rCandidate.mpFillGraphicAttribute)
|
: mpFillGraphicAttribute(rCandidate.mpFillGraphicAttribute)
|
||||||
{
|
{
|
||||||
|
@ -144,11 +144,6 @@ namespace drawinglayer
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
bool FontAttribute::isDefault() const
|
|
||||||
{
|
|
||||||
return mpFontAttribute.same_object(theGlobalDefault::get());
|
|
||||||
}
|
|
||||||
|
|
||||||
FontAttribute& FontAttribute::operator=(const FontAttribute& rCandidate)
|
FontAttribute& FontAttribute::operator=(const FontAttribute& rCandidate)
|
||||||
{
|
{
|
||||||
mpFontAttribute = rCandidate.mpFontAttribute;
|
mpFontAttribute = rCandidate.mpFontAttribute;
|
||||||
|
@ -110,11 +110,6 @@ namespace drawinglayer
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
bool MaterialAttribute3D::isDefault() const
|
|
||||||
{
|
|
||||||
return mpMaterialAttribute3D.same_object(theGlobalDefault::get());
|
|
||||||
}
|
|
||||||
|
|
||||||
MaterialAttribute3D& MaterialAttribute3D::operator=(const MaterialAttribute3D& rCandidate)
|
MaterialAttribute3D& MaterialAttribute3D::operator=(const MaterialAttribute3D& rCandidate)
|
||||||
{
|
{
|
||||||
mpMaterialAttribute3D = rCandidate.mpMaterialAttribute3D;
|
mpMaterialAttribute3D = rCandidate.mpMaterialAttribute3D;
|
||||||
|
@ -47,13 +47,6 @@ namespace drawinglayer
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
ImpSdr3DLightAttribute()
|
|
||||||
: maColor(),
|
|
||||||
maDirection(),
|
|
||||||
mbSpecular(false)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
// data read access
|
// data read access
|
||||||
const basegfx::BColor& getColor() const { return maColor; }
|
const basegfx::BColor& getColor() const { return maColor; }
|
||||||
const basegfx::B3DVector& getDirection() const { return maDirection; }
|
const basegfx::B3DVector& getDirection() const { return maDirection; }
|
||||||
@ -82,11 +75,6 @@ namespace drawinglayer
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
Sdr3DLightAttribute::Sdr3DLightAttribute()
|
|
||||||
: mpSdr3DLightAttribute(theGlobalDefault::get())
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
Sdr3DLightAttribute::Sdr3DLightAttribute(const Sdr3DLightAttribute& rCandidate)
|
Sdr3DLightAttribute::Sdr3DLightAttribute(const Sdr3DLightAttribute& rCandidate)
|
||||||
: mpSdr3DLightAttribute(rCandidate.mpSdr3DLightAttribute)
|
: mpSdr3DLightAttribute(rCandidate.mpSdr3DLightAttribute)
|
||||||
{
|
{
|
||||||
@ -96,11 +84,6 @@ namespace drawinglayer
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
bool Sdr3DLightAttribute::isDefault() const
|
|
||||||
{
|
|
||||||
return mpSdr3DLightAttribute.same_object(theGlobalDefault::get());
|
|
||||||
}
|
|
||||||
|
|
||||||
Sdr3DLightAttribute& Sdr3DLightAttribute::operator=(const Sdr3DLightAttribute& rCandidate)
|
Sdr3DLightAttribute& Sdr3DLightAttribute::operator=(const Sdr3DLightAttribute& rCandidate)
|
||||||
{
|
{
|
||||||
mpSdr3DLightAttribute = rCandidate.mpSdr3DLightAttribute;
|
mpSdr3DLightAttribute = rCandidate.mpSdr3DLightAttribute;
|
||||||
|
@ -70,21 +70,6 @@ namespace drawinglayer
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
ImpSdr3DObjectAttribute()
|
|
||||||
: maNormalsKind(css::drawing::NormalsKind_SPECIFIC),
|
|
||||||
maTextureProjectionX(css::drawing::TextureProjectionMode_OBJECTSPECIFIC),
|
|
||||||
maTextureProjectionY(css::drawing::TextureProjectionMode_OBJECTSPECIFIC),
|
|
||||||
maTextureKind(css::drawing::TextureKind2_LUMINANCE),
|
|
||||||
maTextureMode(css::drawing::TextureMode_REPLACE),
|
|
||||||
maMaterial(),
|
|
||||||
mbNormalsInvert(false),
|
|
||||||
mbDoubleSided(false),
|
|
||||||
mbShadow3D(false),
|
|
||||||
mbTextureFilter(false),
|
|
||||||
mbReducedLineGeometry(false)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
// data read access
|
// data read access
|
||||||
css::drawing::NormalsKind getNormalsKind() const { return maNormalsKind; }
|
css::drawing::NormalsKind getNormalsKind() const { return maNormalsKind; }
|
||||||
css::drawing::TextureProjectionMode getTextureProjectionX() const { return maTextureProjectionX; }
|
css::drawing::TextureProjectionMode getTextureProjectionX() const { return maTextureProjectionX; }
|
||||||
@ -143,20 +128,10 @@ namespace drawinglayer
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
Sdr3DObjectAttribute::Sdr3DObjectAttribute()
|
|
||||||
: mpSdr3DObjectAttribute(theGlobalDefault::get())
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
Sdr3DObjectAttribute::~Sdr3DObjectAttribute()
|
Sdr3DObjectAttribute::~Sdr3DObjectAttribute()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
bool Sdr3DObjectAttribute::isDefault() const
|
|
||||||
{
|
|
||||||
return mpSdr3DObjectAttribute.same_object(theGlobalDefault::get());
|
|
||||||
}
|
|
||||||
|
|
||||||
Sdr3DObjectAttribute& Sdr3DObjectAttribute::operator=(const Sdr3DObjectAttribute& rCandidate)
|
Sdr3DObjectAttribute& Sdr3DObjectAttribute::operator=(const Sdr3DObjectAttribute& rCandidate)
|
||||||
{
|
{
|
||||||
mpSdr3DObjectAttribute = rCandidate.mpSdr3DObjectAttribute;
|
mpSdr3DObjectAttribute = rCandidate.mpSdr3DObjectAttribute;
|
||||||
|
@ -381,16 +381,6 @@ private:
|
|||||||
sal_Unicode nExtraValue;
|
sal_Unicode nExtraValue;
|
||||||
|
|
||||||
|
|
||||||
TextPortion()
|
|
||||||
: pExtraInfos( nullptr )
|
|
||||||
, nLen( 0 )
|
|
||||||
, aOutSz()
|
|
||||||
, nKind( PortionKind::TEXT )
|
|
||||||
, nRightToLeftLevel( 0 )
|
|
||||||
, nExtraValue( 0 )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
TextPortion( sal_Int32 nL )
|
TextPortion( sal_Int32 nL )
|
||||||
: pExtraInfos( nullptr )
|
: pExtraInfos( nullptr )
|
||||||
|
@ -124,9 +124,6 @@ private:
|
|||||||
public:
|
public:
|
||||||
EditUndoRemoveChars(EditEngine* pEE, const EPaM& rEPaM, const OUString& rStr);
|
EditUndoRemoveChars(EditEngine* pEE, const EPaM& rEPaM, const OUString& rStr);
|
||||||
|
|
||||||
const EPaM& GetEPaM() { return aEPaM; }
|
|
||||||
OUString & GetStr() { return aText; }
|
|
||||||
|
|
||||||
virtual void Undo() override;
|
virtual void Undo() override;
|
||||||
virtual void Redo() override;
|
virtual void Redo() override;
|
||||||
};
|
};
|
||||||
|
@ -685,7 +685,6 @@ private:
|
|||||||
|
|
||||||
SpellInfo * CreateSpellInfo( bool bMultipleDocs );
|
SpellInfo * CreateSpellInfo( bool bMultipleDocs );
|
||||||
|
|
||||||
ImpEditEngine(); // disabled
|
|
||||||
ImpEditEngine(EditEngine* pEditEngine, SfxItemPool* pPool);
|
ImpEditEngine(EditEngine* pEditEngine, SfxItemPool* pPool);
|
||||||
void InitDoc(bool bKeepParaAttribs);
|
void InitDoc(bool bKeepParaAttribs);
|
||||||
EditDoc& GetEditDoc() { return aEditDoc; }
|
EditDoc& GetEditDoc() { return aEditDoc; }
|
||||||
|
@ -114,12 +114,6 @@ OverflowingText::OverflowingText(css::uno::Reference< css::datatransfer::XTransf
|
|||||||
|
|
||||||
// class NonOverflowingText
|
// class NonOverflowingText
|
||||||
|
|
||||||
NonOverflowingText::NonOverflowingText(const EditTextObject * /*pTObj*/, bool bLastParaInterrupted)
|
|
||||||
: mbLastParaInterrupted(bLastParaInterrupted)
|
|
||||||
{
|
|
||||||
// XXX: may have to delete pTObj
|
|
||||||
}
|
|
||||||
|
|
||||||
NonOverflowingText::NonOverflowingText(const ESelection &aSel, bool bLastParaInterrupted)
|
NonOverflowingText::NonOverflowingText(const ESelection &aSel, bool bLastParaInterrupted)
|
||||||
: maContentSel(aSel)
|
: maContentSel(aSel)
|
||||||
, mbLastParaInterrupted(bLastParaInterrupted)
|
, mbLastParaInterrupted(bLastParaInterrupted)
|
||||||
|
@ -178,9 +178,6 @@ namespace abp
|
|||||||
,const OUString& _sName
|
,const OUString& _sName
|
||||||
,PackageAccessControl
|
,PackageAccessControl
|
||||||
);
|
);
|
||||||
|
|
||||||
private:
|
|
||||||
ODataSource( ); // never implemented
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
@ -83,7 +83,6 @@ namespace pcr
|
|||||||
public:
|
public:
|
||||||
inline StlSyntaxSequence() : UnoBase() { }
|
inline StlSyntaxSequence() : UnoBase() { }
|
||||||
explicit inline StlSyntaxSequence( const UnoBase& rSeq ) : UnoBase( rSeq ) { }
|
explicit inline StlSyntaxSequence( const UnoBase& rSeq ) : UnoBase( rSeq ) { }
|
||||||
inline StlSyntaxSequence( const ELEMENT* pElements, sal_Int32 len ) : UnoBase( pElements, len ) { }
|
|
||||||
explicit inline StlSyntaxSequence( sal_Int32 len ) : UnoBase( len ) { }
|
explicit inline StlSyntaxSequence( sal_Int32 len ) : UnoBase( len ) { }
|
||||||
|
|
||||||
typedef const ELEMENT* const_iterator;
|
typedef const ELEMENT* const_iterator;
|
||||||
|
@ -42,9 +42,6 @@ namespace pcr
|
|||||||
);
|
);
|
||||||
|
|
||||||
inline operator const css::util::URL& () const { return m_aURL; }
|
inline operator const css::util::URL& () const { return m_aURL; }
|
||||||
|
|
||||||
private:
|
|
||||||
UnoURL(); // never implemented
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
@ -38,7 +38,6 @@ $(eval $(call gb_Library_use_libraries,xmlfa,\
|
|||||||
$(eval $(call gb_Library_add_exception_objects,xmlfa,\
|
$(eval $(call gb_Library_add_exception_objects,xmlfa,\
|
||||||
filter/source/xmlfilteradaptor/XmlFilterAdaptor \
|
filter/source/xmlfilteradaptor/XmlFilterAdaptor \
|
||||||
filter/source/xmlfilteradaptor/genericfilter \
|
filter/source/xmlfilteradaptor/genericfilter \
|
||||||
filter/source/xmlfilteradaptor/streamwrap \
|
|
||||||
))
|
))
|
||||||
|
|
||||||
# vim: set noet sw=4 ts=4:
|
# vim: set noet sw=4 ts=4:
|
||||||
|
@ -188,7 +188,6 @@ public:
|
|||||||
void addRGB( const Color& rColor );
|
void addRGB( const Color& rColor );
|
||||||
void addRect( const Rectangle& rRect );
|
void addRect( const Rectangle& rRect );
|
||||||
void addMatrix( const ::basegfx::B2DHomMatrix& rMatrix ); // #i73264#
|
void addMatrix( const ::basegfx::B2DHomMatrix& rMatrix ); // #i73264#
|
||||||
void addString( const char* pString );
|
|
||||||
void addStream( SvStream& rIn );
|
void addStream( SvStream& rIn );
|
||||||
|
|
||||||
static void writeMatrix( SvStream& rOut, const ::basegfx::B2DHomMatrix& rMatrix ); // #i73264#
|
static void writeMatrix( SvStream& rOut, const ::basegfx::B2DHomMatrix& rMatrix ); // #i73264#
|
||||||
|
@ -323,18 +323,6 @@ void Tag::writeMatrix( SvStream& rOut, const ::basegfx::B2DHomMatrix& rMatrix )
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void Tag::addString( const char* pString )
|
|
||||||
{
|
|
||||||
if( pString )
|
|
||||||
{
|
|
||||||
while( *pString )
|
|
||||||
addUI8( *pString++ );
|
|
||||||
}
|
|
||||||
|
|
||||||
addUI8( 0 );
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void Tag::addStream( SvStream& rIn )
|
void Tag::addStream( SvStream& rIn )
|
||||||
{
|
{
|
||||||
(*this).WriteStream( rIn );
|
(*this).WriteStream( rIn );
|
||||||
|
@ -25,7 +25,6 @@ struct FloatPoint
|
|||||||
double X;
|
double X;
|
||||||
double Y;
|
double Y;
|
||||||
FloatPoint():X(0), Y(0){};
|
FloatPoint():X(0), Y(0){};
|
||||||
FloatPoint( const double& rX, const double& rY ) { X = rX; Y = rY; };
|
|
||||||
};
|
};
|
||||||
|
|
||||||
struct FloatRect
|
struct FloatRect
|
||||||
@ -35,13 +34,6 @@ struct FloatRect
|
|||||||
double Right;
|
double Right;
|
||||||
double Bottom;
|
double Bottom;
|
||||||
FloatRect():Left(0), Top(0), Right(0), Bottom(0){};
|
FloatRect():Left(0), Top(0), Right(0), Bottom(0){};
|
||||||
FloatRect( const FloatPoint& rTopLeft, const FloatPoint& rBottomRight )
|
|
||||||
{
|
|
||||||
Left = rTopLeft.X;
|
|
||||||
Top = rTopLeft.Y;
|
|
||||||
Right = rBottomRight.X;
|
|
||||||
Bottom = rBottomRight.Y;
|
|
||||||
}
|
|
||||||
void Justify()
|
void Justify()
|
||||||
{
|
{
|
||||||
double fTemp;
|
double fTemp;
|
||||||
|
@ -28,24 +28,12 @@ struct ARGBColor
|
|||||||
{}
|
{}
|
||||||
explicit ARGBColor(double fGrey) : a(1.0), r(fGrey), g(fGrey), b(fGrey)
|
explicit ARGBColor(double fGrey) : a(1.0), r(fGrey), g(fGrey), b(fGrey)
|
||||||
{}
|
{}
|
||||||
ARGBColor( double r_, double g_, double b_ ) :
|
|
||||||
a(1.0), r(r_), g(g_), b(b_)
|
|
||||||
{}
|
|
||||||
ARGBColor( double a_, double r_, double g_, double b_ ) :
|
|
||||||
a(a_), r(r_), g(g_), b(b_)
|
|
||||||
{}
|
|
||||||
ARGBColor( int r_, int g_, int b_ ) :
|
ARGBColor( int r_, int g_, int b_ ) :
|
||||||
a(1.0),
|
a(1.0),
|
||||||
r(toDoubleColor(sal::static_int_cast<sal_uInt8>(r_))),
|
r(toDoubleColor(sal::static_int_cast<sal_uInt8>(r_))),
|
||||||
g(toDoubleColor(sal::static_int_cast<sal_uInt8>(g_))),
|
g(toDoubleColor(sal::static_int_cast<sal_uInt8>(g_))),
|
||||||
b(toDoubleColor(sal::static_int_cast<sal_uInt8>(b_)))
|
b(toDoubleColor(sal::static_int_cast<sal_uInt8>(b_)))
|
||||||
{}
|
{}
|
||||||
ARGBColor( int a_, int r_, int g_, int b_ ) :
|
|
||||||
a(toDoubleColor(sal::static_int_cast<sal_uInt8>(a_))),
|
|
||||||
r(toDoubleColor(sal::static_int_cast<sal_uInt8>(r_))),
|
|
||||||
g(toDoubleColor(sal::static_int_cast<sal_uInt8>(g_))),
|
|
||||||
b(toDoubleColor(sal::static_int_cast<sal_uInt8>(b_)))
|
|
||||||
{}
|
|
||||||
double a;
|
double a;
|
||||||
double r;
|
double r;
|
||||||
double g;
|
double g;
|
||||||
|
@ -118,10 +118,6 @@ protected:
|
|||||||
virtual void ExportContent_() override {}
|
virtual void ExportContent_() override {}
|
||||||
virtual void ExportMasterStyles_() override {}
|
virtual void ExportMasterStyles_() override {}
|
||||||
virtual sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum /* eClass */ ) override { return 0; }
|
virtual sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum /* eClass */ ) override { return 0; }
|
||||||
|
|
||||||
private:
|
|
||||||
|
|
||||||
SVGExport();
|
|
||||||
};
|
};
|
||||||
|
|
||||||
class ObjectRepresentation
|
class ObjectRepresentation
|
||||||
|
@ -89,8 +89,6 @@ private:
|
|||||||
SVGFontExport& mrFontExport;
|
SVGFontExport& mrFontExport;
|
||||||
SvXMLElementExport* mpElemFont;
|
SvXMLElementExport* mpElemFont;
|
||||||
|
|
||||||
SVGAttributeWriter();
|
|
||||||
|
|
||||||
static double ImplRound( double fVal );
|
static double ImplRound( double fVal );
|
||||||
|
|
||||||
public:
|
public:
|
||||||
@ -349,7 +347,6 @@ class SVGWriter : public cppu::WeakImplHelper< XSVGWriter >
|
|||||||
private:
|
private:
|
||||||
Reference< XComponentContext > mxContext;
|
Reference< XComponentContext > mxContext;
|
||||||
Sequence< css::beans::PropertyValue > maFilterData;
|
Sequence< css::beans::PropertyValue > maFilterData;
|
||||||
SVGWriter();
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit SVGWriter( const Sequence<Any>& args,
|
explicit SVGWriter( const Sequence<Any>& args,
|
||||||
|
@ -1,59 +0,0 @@
|
|||||||
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
||||||
/*
|
|
||||||
* This file is part of the LibreOffice project.
|
|
||||||
*
|
|
||||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
||||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
||||||
*
|
|
||||||
* This file incorporates work covered by the following license notice:
|
|
||||||
*
|
|
||||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
||||||
* contributor license agreements. See the NOTICE file distributed
|
|
||||||
* with this work for additional information regarding copyright
|
|
||||||
* ownership. The ASF licenses this file to you under the Apache
|
|
||||||
* License, Version 2.0 (the "License"); you may not use this file
|
|
||||||
* except in compliance with the License. You may obtain a copy of
|
|
||||||
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
#include "streamwrap.hxx"
|
|
||||||
#include <osl/file.hxx>
|
|
||||||
|
|
||||||
namespace foo
|
|
||||||
{
|
|
||||||
|
|
||||||
using namespace ::com::sun::star::uno;
|
|
||||||
using namespace ::com::sun::star::io;
|
|
||||||
using namespace ::com::sun::star::lang;
|
|
||||||
using namespace ::osl;
|
|
||||||
|
|
||||||
|
|
||||||
//= OOutputStreamWrapper
|
|
||||||
|
|
||||||
|
|
||||||
void SAL_CALL OOutputStreamWrapper::writeBytes(const css::uno::Sequence< sal_Int8 >& aData) throw( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception )
|
|
||||||
{
|
|
||||||
sal_uInt64 nWritten = 0;
|
|
||||||
rStream.write(aData.getConstArray(),aData.getLength(),nWritten);
|
|
||||||
if (nWritten != (sal_uInt64)aData.getLength())
|
|
||||||
{
|
|
||||||
throw css::io::BufferSizeExceededException(OUString(),static_cast<css::uno::XWeak*>(this));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void SAL_CALL OOutputStreamWrapper::flush() throw( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void SAL_CALL OOutputStreamWrapper::closeOutput() throw( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace utl
|
|
||||||
|
|
||||||
|
|
||||||
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
|
@ -1,58 +0,0 @@
|
|||||||
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
||||||
/*
|
|
||||||
* This file is part of the LibreOffice project.
|
|
||||||
*
|
|
||||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
||||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
||||||
*
|
|
||||||
* This file incorporates work covered by the following license notice:
|
|
||||||
*
|
|
||||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
||||||
* contributor license agreements. See the NOTICE file distributed
|
|
||||||
* with this work for additional information regarding copyright
|
|
||||||
* ownership. The ASF licenses this file to you under the Apache
|
|
||||||
* License, Version 2.0 (the "License"); you may not use this file
|
|
||||||
* except in compliance with the License. You may obtain a copy of
|
|
||||||
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
||||||
*/
|
|
||||||
#ifndef INCLUDED_FILTER_SOURCE_XMLFILTERADAPTOR_STREAMWRAP_HXX
|
|
||||||
#define INCLUDED_FILTER_SOURCE_XMLFILTERADAPTOR_STREAMWRAP_HXX
|
|
||||||
|
|
||||||
#include <osl/mutex.hxx>
|
|
||||||
#include <com/sun/star/io/XOutputStream.hpp>
|
|
||||||
#include <com/sun/star/io/XInputStream.hpp>
|
|
||||||
#include <com/sun/star/io/XSeekable.hpp>
|
|
||||||
#include <cppuhelper/implbase.hxx>
|
|
||||||
|
|
||||||
namespace osl
|
|
||||||
{
|
|
||||||
class File;
|
|
||||||
}
|
|
||||||
|
|
||||||
namespace foo
|
|
||||||
{
|
|
||||||
|
|
||||||
//= OOutputStreamWrapper
|
|
||||||
|
|
||||||
typedef ::cppu::WeakImplHelper<css::io::XOutputStream> OutputStreamWrapper_Base;
|
|
||||||
// needed for some compilers
|
|
||||||
class OOutputStreamWrapper : public OutputStreamWrapper_Base
|
|
||||||
{
|
|
||||||
::osl::File& rStream;
|
|
||||||
|
|
||||||
public:
|
|
||||||
explicit OOutputStreamWrapper(osl::File& _rStream) :rStream(_rStream) { }
|
|
||||||
|
|
||||||
// css::io::XOutputStream
|
|
||||||
virtual void SAL_CALL writeBytes(const css::uno::Sequence< sal_Int8 >& aData) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception) override;
|
|
||||||
virtual void SAL_CALL flush() throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception) override;
|
|
||||||
virtual void SAL_CALL closeOutput() throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception) override;
|
|
||||||
};
|
|
||||||
|
|
||||||
} // namespace utl
|
|
||||||
|
|
||||||
|
|
||||||
#endif // INCLUDED_FILTER_SOURCE_XMLFILTERADAPTOR_STREAMWRAP_HXX
|
|
||||||
|
|
||||||
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
|
@ -107,10 +107,6 @@ public:
|
|||||||
,nRepresentation( _nRepresent )
|
,nRepresentation( _nRepresent )
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
HtmlSuccessfulObj()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
typedef std::vector<HtmlSuccessfulObj> HtmlSuccessfulObjList;
|
typedef std::vector<HtmlSuccessfulObj> HtmlSuccessfulObjList;
|
||||||
|
@ -1104,18 +1104,6 @@ oslInterlockedCount OControlModel::unlockInstance( LockAccess )
|
|||||||
return lockCount;
|
return lockCount;
|
||||||
}
|
}
|
||||||
|
|
||||||
void OControlModel::firePropertyChanges( const Sequence< sal_Int32 >& _rHandles, const Sequence< Any >& _rOldValues,
|
|
||||||
const Sequence< Any >& _rNewValues, LockAccess )
|
|
||||||
{
|
|
||||||
OPropertySetHelper::fire(
|
|
||||||
const_cast< Sequence< sal_Int32 >& >( _rHandles ).getArray(),
|
|
||||||
_rNewValues.getConstArray(),
|
|
||||||
_rOldValues.getConstArray(),
|
|
||||||
_rHandles.getLength(),
|
|
||||||
false
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
void OControlModel::firePropertyChanges( const std::vector< sal_Int32 >& _rHandles, const std::vector< Any >& _rOldValues,
|
void OControlModel::firePropertyChanges( const std::vector< sal_Int32 >& _rHandles, const std::vector< Any >& _rOldValues,
|
||||||
const std::vector< Any >& _rNewValues, LockAccess )
|
const std::vector< Any >& _rNewValues, LockAccess )
|
||||||
{
|
{
|
||||||
|
@ -501,12 +501,6 @@ public:
|
|||||||
const std::vector< css::uno::Any >& _rNewValues,
|
const std::vector< css::uno::Any >& _rNewValues,
|
||||||
LockAccess
|
LockAccess
|
||||||
);
|
);
|
||||||
void firePropertyChanges(
|
|
||||||
const css::uno::Sequence< sal_Int32 >& _rHandles,
|
|
||||||
const css::uno::Sequence< css::uno::Any >& _rOldValues,
|
|
||||||
const css::uno::Sequence< css::uno::Any >& _rNewValues,
|
|
||||||
LockAccess
|
|
||||||
);
|
|
||||||
|
|
||||||
inline ::osl::Mutex&
|
inline ::osl::Mutex&
|
||||||
getInstanceMutex() { return m_aMutex; }
|
getInstanceMutex() { return m_aMutex; }
|
||||||
|
@ -35,7 +35,7 @@ namespace frm
|
|||||||
static SimpleResMgr* m_pImpl;
|
static SimpleResMgr* m_pImpl;
|
||||||
private:
|
private:
|
||||||
// no instantiation allowed
|
// no instantiation allowed
|
||||||
ResourceManager() { }
|
ResourceManager() = delete;
|
||||||
~ResourceManager() { }
|
~ResourceManager() { }
|
||||||
|
|
||||||
// we'll instantiate one static member of the following class, which, in its dtor,
|
// we'll instantiate one static member of the following class, which, in its dtor,
|
||||||
|
@ -50,7 +50,7 @@ class PropertyInfoService
|
|||||||
static PropertyMap s_AllKnownProperties;
|
static PropertyMap s_AllKnownProperties;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
PropertyInfoService() { }
|
PropertyInfoService() = delete;
|
||||||
|
|
||||||
static sal_Int32 getPropertyId(const OUString& _rName);
|
static sal_Int32 getPropertyId(const OUString& _rName);
|
||||||
|
|
||||||
|
@ -1758,23 +1758,6 @@ bool FormulaMissingToken::operator==( const FormulaToken& r ) const
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
FormulaSubroutineToken::FormulaSubroutineToken( const FormulaSubroutineToken& r ) :
|
|
||||||
FormulaToken( r ),
|
|
||||||
mpArray( r.mpArray->Clone())
|
|
||||||
{
|
|
||||||
}
|
|
||||||
FormulaSubroutineToken::~FormulaSubroutineToken()
|
|
||||||
{
|
|
||||||
delete mpArray;
|
|
||||||
}
|
|
||||||
bool FormulaSubroutineToken::operator==( const FormulaToken& r ) const
|
|
||||||
{
|
|
||||||
// Arrays don't equal..
|
|
||||||
return FormulaToken::operator==( r ) &&
|
|
||||||
(mpArray == static_cast<const FormulaSubroutineToken&>(r).mpArray);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
bool FormulaUnknownToken::operator==( const FormulaToken& r ) const
|
bool FormulaUnknownToken::operator==( const FormulaToken& r ) const
|
||||||
{
|
{
|
||||||
return FormulaToken::operator==( r );
|
return FormulaToken::operator==( r );
|
||||||
|
@ -39,7 +39,7 @@ namespace formula
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
// no instantiation allowed
|
// no instantiation allowed
|
||||||
ResourceManager() { }
|
ResourceManager() = delete;
|
||||||
~ResourceManager() { }
|
~ResourceManager() { }
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
@ -1,92 +0,0 @@
|
|||||||
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
||||||
/*
|
|
||||||
* This file is part of the LibreOffice project.
|
|
||||||
*
|
|
||||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
||||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
||||||
*
|
|
||||||
* This file incorporates work covered by the following license notice:
|
|
||||||
*
|
|
||||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
||||||
* contributor license agreements. See the NOTICE file distributed
|
|
||||||
* with this work for additional information regarding copyright
|
|
||||||
* ownership. The ASF licenses this file to you under the Apache
|
|
||||||
* License, Version 2.0 (the "License"); you may not use this file
|
|
||||||
* except in compliance with the License. You may obtain a copy of
|
|
||||||
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*TODO
|
|
||||||
- late init
|
|
||||||
- order by number!
|
|
||||||
- insert default detector and loader as last ones in hashes ... don't hold it as an extra member!
|
|
||||||
=> CheckedIterator will be obsolete!
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef INCLUDED_FRAMEWORK_INC_CLASSES_FILTERCACHE_HXX
|
|
||||||
#define INCLUDED_FRAMEWORK_INC_CLASSES_FILTERCACHE_HXX
|
|
||||||
|
|
||||||
#include <classes/filtercachedata.hxx>
|
|
||||||
|
|
||||||
#include <general.h>
|
|
||||||
#include <queries.h>
|
|
||||||
|
|
||||||
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
|
|
||||||
#include <com/sun/star/registry/XRegistryKey.hpp>
|
|
||||||
#include <com/sun/star/beans/PropertyValue.hpp>
|
|
||||||
#include <com/sun/star/container/ElementExistException.hpp>
|
|
||||||
#include <com/sun/star/container/NoSuchElementException.hpp>
|
|
||||||
|
|
||||||
#include <rtl/ustring.hxx>
|
|
||||||
|
|
||||||
#ifdef ENABLE_GENERATEFILTERCACHE
|
|
||||||
#include <rtl/ustrbuf.hxx>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
namespace framework{
|
|
||||||
|
|
||||||
/*-************************************************************************************************************
|
|
||||||
@short cache for all filter and type information
|
|
||||||
@descr Frameloader - and filterfactory need some information about our current registered filters and types.
|
|
||||||
For better performance its necessary to cache all needed values.
|
|
||||||
|
|
||||||
@devstatus ready to use
|
|
||||||
@threadsafe yes
|
|
||||||
*//*-*************************************************************************************************************/
|
|
||||||
|
|
||||||
class FilterCache
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
|
|
||||||
// public methods
|
|
||||||
|
|
||||||
public:
|
|
||||||
|
|
||||||
// constructor / destructor
|
|
||||||
|
|
||||||
FilterCache( sal_Int32 nVersion = DEFAULT_FILTERCACHE_VERSION,
|
|
||||||
ConfigItemMode nMode = DEFAULT_FILTERCACHE_MODE );
|
|
||||||
|
|
||||||
/*-****************************************************************************************************
|
|
||||||
@short standard destructor to delete instance
|
|
||||||
@descr This will clear the cache if last owner release it.
|
|
||||||
*//*-*****************************************************************************************************/
|
|
||||||
|
|
||||||
virtual ~FilterCache();
|
|
||||||
|
|
||||||
// private variables
|
|
||||||
|
|
||||||
private:
|
|
||||||
|
|
||||||
static sal_Int32 m_nRefCount;
|
|
||||||
static sal_Int32 m_nVersion;
|
|
||||||
static sal_Int16 m_nMode;
|
|
||||||
|
|
||||||
}; // class FilterCache
|
|
||||||
|
|
||||||
} // namespace framework
|
|
||||||
|
|
||||||
#endif // INCLUDED_FRAMEWORK_INC_CLASSES_FILTERCACHE_HXX
|
|
||||||
|
|
||||||
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
|
@ -1,330 +0,0 @@
|
|||||||
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
||||||
/*
|
|
||||||
* This file is part of the LibreOffice project.
|
|
||||||
*
|
|
||||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
||||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
||||||
*
|
|
||||||
* This file incorporates work covered by the following license notice:
|
|
||||||
*
|
|
||||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
||||||
* contributor license agreements. See the NOTICE file distributed
|
|
||||||
* with this work for additional information regarding copyright
|
|
||||||
* ownership. The ASF licenses this file to you under the Apache
|
|
||||||
* License, Version 2.0 (the "License"); you may not use this file
|
|
||||||
* except in compliance with the License. You may obtain a copy of
|
|
||||||
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef INCLUDED_FRAMEWORK_INC_CLASSES_FILTERCACHEDATA_HXX
|
|
||||||
#define INCLUDED_FRAMEWORK_INC_CLASSES_FILTERCACHEDATA_HXX
|
|
||||||
|
|
||||||
#include <classes/wildcard.hxx>
|
|
||||||
#include <classes/converter.hxx>
|
|
||||||
#include <macros/xinterface.hxx>
|
|
||||||
#include <general.h>
|
|
||||||
|
|
||||||
#include <com/sun/star/beans/PropertyValue.hpp>
|
|
||||||
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
|
|
||||||
#include <com/sun/star/util/XChangesListener.hpp>
|
|
||||||
#include <com/sun/star/util/XChangesNotifier.hpp>
|
|
||||||
|
|
||||||
#include <unotools/configitem.hxx>
|
|
||||||
#include <cppuhelper/weak.hxx>
|
|
||||||
#include <rtl/ustring.hxx>
|
|
||||||
|
|
||||||
#include <iterator>
|
|
||||||
#include <unordered_map>
|
|
||||||
#include <vector>
|
|
||||||
|
|
||||||
namespace framework{
|
|
||||||
|
|
||||||
#define DEFAULT_FILTERCACHE_VERSION 6 /// these implmentation of FilterCache support different version of TypeDetection.xml! This define the current set default one.
|
|
||||||
|
|
||||||
#define DEFAULT_FILTERCACHE_MODE ConfigItemMode::DelayedUpdate | ConfigItemMode::AllLocales /// ConfigItems could run in different modes: supported values are ... { ConfigItemMode::ImmediateUpdate, ConfigItemMode::DelayedUpdate, ConfigItemMode::AllLocales }
|
|
||||||
|
|
||||||
enum EModifyState
|
|
||||||
{
|
|
||||||
E_UNTOUCHED ,
|
|
||||||
E_ADDED ,
|
|
||||||
E_CHANGED ,
|
|
||||||
E_REMOVED
|
|
||||||
};
|
|
||||||
|
|
||||||
enum EFilterPackage
|
|
||||||
{
|
|
||||||
E_STANDARD ,
|
|
||||||
E_ADDITIONAL
|
|
||||||
};
|
|
||||||
|
|
||||||
// These struct define a type, which present the type of a file.
|
|
||||||
// He is used for easy filter detection without file stream detection!
|
|
||||||
// The internal name is the keyname of an item with these structure in our hash map or our configuration set!
|
|
||||||
|
|
||||||
struct FileType
|
|
||||||
{
|
|
||||||
|
|
||||||
// public methods
|
|
||||||
|
|
||||||
public:
|
|
||||||
|
|
||||||
inline FileType ( ) { impl_clear(); }
|
|
||||||
inline FileType ( const FileType& rCopy ) { impl_copy( rCopy ); }
|
|
||||||
inline ~FileType ( ) { impl_clear(); }
|
|
||||||
inline FileType& operator= ( const FileType& rCopy ) { return impl_copy( rCopy ); }
|
|
||||||
|
|
||||||
private:
|
|
||||||
|
|
||||||
inline void impl_clear()
|
|
||||||
{
|
|
||||||
bPreferred = false;
|
|
||||||
sName.clear();
|
|
||||||
sMediaType.clear();
|
|
||||||
sClipboardFormat.clear();
|
|
||||||
nDocumentIconID = 0;
|
|
||||||
lUINames.clear();
|
|
||||||
lURLPattern.clear();
|
|
||||||
lExtensions.clear();
|
|
||||||
}
|
|
||||||
|
|
||||||
inline FileType& impl_copy( const FileType& rCopy )
|
|
||||||
{
|
|
||||||
bPreferred = rCopy.bPreferred;
|
|
||||||
sName = rCopy.sName;
|
|
||||||
lUINames = rCopy.lUINames;
|
|
||||||
sMediaType = rCopy.sMediaType;
|
|
||||||
sClipboardFormat = rCopy.sClipboardFormat;
|
|
||||||
nDocumentIconID = rCopy.nDocumentIconID;
|
|
||||||
lURLPattern = rCopy.lURLPattern;
|
|
||||||
lExtensions = rCopy.lExtensions;
|
|
||||||
return (*this);
|
|
||||||
}
|
|
||||||
|
|
||||||
// public member
|
|
||||||
|
|
||||||
public:
|
|
||||||
|
|
||||||
bool bPreferred;
|
|
||||||
OUString sName;
|
|
||||||
OUStringHashMap lUINames;
|
|
||||||
OUString sMediaType;
|
|
||||||
OUString sClipboardFormat;
|
|
||||||
sal_Int32 nDocumentIconID;
|
|
||||||
std::vector<OUString> lURLPattern;
|
|
||||||
std::vector<OUString> lExtensions;
|
|
||||||
};
|
|
||||||
|
|
||||||
// These struct describe a filter which is registered for one type.
|
|
||||||
// He hold information about services which present the document himself (like a item) and a filter service which
|
|
||||||
// filter a file in these document.
|
|
||||||
// The internal name is the keyname of an item with these structure in our hash map or our configuration set!
|
|
||||||
|
|
||||||
struct Filter
|
|
||||||
{
|
|
||||||
|
|
||||||
// public methods
|
|
||||||
|
|
||||||
public:
|
|
||||||
|
|
||||||
inline Filter ( ) { impl_clear(); }
|
|
||||||
inline Filter ( const Filter& rCopy ) { impl_copy( rCopy ); }
|
|
||||||
inline ~Filter ( ) { impl_clear(); }
|
|
||||||
inline Filter& operator= ( const Filter& rCopy ) { return impl_copy( rCopy ); }
|
|
||||||
|
|
||||||
private:
|
|
||||||
|
|
||||||
inline void impl_clear()
|
|
||||||
{
|
|
||||||
nOrder = 0;
|
|
||||||
sName.clear();
|
|
||||||
sType.clear();
|
|
||||||
sDocumentService.clear();
|
|
||||||
sFilterService.clear();
|
|
||||||
sUIComponent.clear();
|
|
||||||
nFlags = 0;
|
|
||||||
nFileFormatVersion = 0;
|
|
||||||
sTemplateName.clear();
|
|
||||||
lUINames.clear();
|
|
||||||
lUserData.clear();
|
|
||||||
}
|
|
||||||
|
|
||||||
inline Filter& impl_copy( const Filter& rCopy )
|
|
||||||
{
|
|
||||||
nOrder = rCopy.nOrder;
|
|
||||||
sName = rCopy.sName;
|
|
||||||
sType = rCopy.sType;
|
|
||||||
lUINames = rCopy.lUINames;
|
|
||||||
sDocumentService = rCopy.sDocumentService;
|
|
||||||
sFilterService = rCopy.sFilterService;
|
|
||||||
sUIComponent = rCopy.sUIComponent;
|
|
||||||
nFlags = rCopy.nFlags;
|
|
||||||
nFileFormatVersion = rCopy.nFileFormatVersion;
|
|
||||||
sTemplateName = rCopy.sTemplateName;
|
|
||||||
lUserData = rCopy.lUserData;
|
|
||||||
return (*this);
|
|
||||||
}
|
|
||||||
|
|
||||||
// public member
|
|
||||||
|
|
||||||
public:
|
|
||||||
|
|
||||||
sal_Int32 nOrder;
|
|
||||||
OUString sName;
|
|
||||||
OUString sType;
|
|
||||||
OUStringHashMap lUINames;
|
|
||||||
OUString sDocumentService;
|
|
||||||
OUString sFilterService;
|
|
||||||
OUString sUIComponent;
|
|
||||||
sal_Int32 nFlags;
|
|
||||||
std::vector<OUString> lUserData;
|
|
||||||
sal_Int32 nFileFormatVersion;
|
|
||||||
OUString sTemplateName;
|
|
||||||
};
|
|
||||||
|
|
||||||
// Programmer can register his own services for an content detection of different types.
|
|
||||||
// The implementation or service name of these is the keyname of an item with these structure
|
|
||||||
// in our hash map or our configuration set!
|
|
||||||
|
|
||||||
struct Detector
|
|
||||||
{
|
|
||||||
|
|
||||||
// public methods
|
|
||||||
|
|
||||||
public:
|
|
||||||
|
|
||||||
inline Detector ( ) { impl_clear(); }
|
|
||||||
inline Detector ( const Detector& rCopy ) { impl_copy( rCopy ); }
|
|
||||||
inline ~Detector ( ) { impl_clear(); }
|
|
||||||
inline Detector& operator= ( const Detector& rCopy ) { return impl_copy( rCopy ); }
|
|
||||||
|
|
||||||
private:
|
|
||||||
|
|
||||||
inline void impl_clear()
|
|
||||||
{
|
|
||||||
sName.clear();
|
|
||||||
lTypes.clear();
|
|
||||||
}
|
|
||||||
|
|
||||||
inline Detector& impl_copy( const Detector& rCopy )
|
|
||||||
{
|
|
||||||
sName = rCopy.sName;
|
|
||||||
lTypes = rCopy.lTypes;
|
|
||||||
return (*this);
|
|
||||||
}
|
|
||||||
|
|
||||||
// public member
|
|
||||||
|
|
||||||
public:
|
|
||||||
|
|
||||||
OUString sName;
|
|
||||||
std::vector<OUString> lTypes;
|
|
||||||
};
|
|
||||||
|
|
||||||
// Programmer can register his own services for loading documents in a frame.
|
|
||||||
// The implementation or service name of these is the keyname of an item with these structure
|
|
||||||
// in our hash map or our configuration set!
|
|
||||||
|
|
||||||
struct Loader
|
|
||||||
{
|
|
||||||
|
|
||||||
// public methods
|
|
||||||
|
|
||||||
public:
|
|
||||||
|
|
||||||
inline Loader ( ) { impl_clear(); }
|
|
||||||
inline Loader ( const Loader& rCopy ) { impl_copy( rCopy ); }
|
|
||||||
inline ~Loader ( ) { impl_clear(); }
|
|
||||||
inline Loader& operator= ( const Loader& rCopy ) { return impl_copy( rCopy ); }
|
|
||||||
|
|
||||||
private:
|
|
||||||
|
|
||||||
inline void impl_clear()
|
|
||||||
{
|
|
||||||
sName.clear();
|
|
||||||
lUINames.clear();
|
|
||||||
lTypes.clear();
|
|
||||||
}
|
|
||||||
|
|
||||||
inline Loader& impl_copy( const Loader& rCopy )
|
|
||||||
{
|
|
||||||
sName = rCopy.sName;
|
|
||||||
lUINames = rCopy.lUINames;
|
|
||||||
lTypes = rCopy.lTypes;
|
|
||||||
return (*this);
|
|
||||||
}
|
|
||||||
|
|
||||||
// public member
|
|
||||||
|
|
||||||
public:
|
|
||||||
|
|
||||||
OUString sName;
|
|
||||||
OUStringHashMap lUINames;
|
|
||||||
std::vector<OUString> lTypes;
|
|
||||||
};
|
|
||||||
|
|
||||||
// Programmer can register his own services to handle a FileType and intercept dispatches.
|
|
||||||
// Don't forget: It's not a FrameLoader - it's a ContentHandler! (normally without any UI)
|
|
||||||
|
|
||||||
struct ContentHandler
|
|
||||||
{
|
|
||||||
|
|
||||||
// public methods
|
|
||||||
|
|
||||||
public:
|
|
||||||
|
|
||||||
inline ContentHandler( ) { impl_clear(); }
|
|
||||||
inline ContentHandler( const ContentHandler& rCopy ) { impl_copy( rCopy ); }
|
|
||||||
inline ~ContentHandler( ) { impl_clear(); }
|
|
||||||
inline ContentHandler& operator= ( const ContentHandler& rCopy ) { return impl_copy( rCopy ); }
|
|
||||||
|
|
||||||
private:
|
|
||||||
|
|
||||||
inline void impl_clear()
|
|
||||||
{
|
|
||||||
sName.clear();
|
|
||||||
lTypes.clear();
|
|
||||||
}
|
|
||||||
|
|
||||||
inline ContentHandler& impl_copy( const ContentHandler& rCopy )
|
|
||||||
{
|
|
||||||
sName = rCopy.sName;
|
|
||||||
lTypes = rCopy.lTypes;
|
|
||||||
return (*this);
|
|
||||||
}
|
|
||||||
|
|
||||||
// public member
|
|
||||||
|
|
||||||
public:
|
|
||||||
|
|
||||||
OUString sName;
|
|
||||||
std::vector<OUString> lTypes;
|
|
||||||
};
|
|
||||||
|
|
||||||
// We need different hash maps for different tables of our configuration management.
|
|
||||||
// Follow maps convert <names> to <properties> of type, filter, detector, loader ...
|
|
||||||
// and could be used in a generic way
|
|
||||||
|
|
||||||
template< class HashType >
|
|
||||||
class SetNodeHash : public std::unordered_map< OUString ,
|
|
||||||
HashType ,
|
|
||||||
OUStringHash >
|
|
||||||
{
|
|
||||||
};
|
|
||||||
|
|
||||||
// Use these hashes to implement different tables which assign types to frame loader or detect services.
|
|
||||||
// It's an optimism to find registered services faster!
|
|
||||||
// The preferred hash maps file extensions to preferred types to find these ones faster.
|
|
||||||
|
|
||||||
class PerformanceHash : public std::unordered_map< OUString,
|
|
||||||
std::vector<OUString>,
|
|
||||||
OUStringHash >
|
|
||||||
{
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
} // namespace framework
|
|
||||||
|
|
||||||
#endif // INCLUDED_FRAMEWORK_INC_CLASSES_FILTERCACHEDATA_HXX
|
|
||||||
|
|
||||||
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
|
@ -1,65 +0,0 @@
|
|||||||
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
||||||
/*
|
|
||||||
* This file is part of the LibreOffice project.
|
|
||||||
*
|
|
||||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
||||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
||||||
*
|
|
||||||
* This file incorporates work covered by the following license notice:
|
|
||||||
*
|
|
||||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
||||||
* contributor license agreements. See the NOTICE file distributed
|
|
||||||
* with this work for additional information regarding copyright
|
|
||||||
* ownership. The ASF licenses this file to you under the Apache
|
|
||||||
* License, Version 2.0 (the "License"); you may not use this file
|
|
||||||
* except in compliance with the License. You may obtain a copy of
|
|
||||||
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef INCLUDED_FRAMEWORK_INC_CLASSES_WILDCARD_HXX
|
|
||||||
#define INCLUDED_FRAMEWORK_INC_CLASSES_WILDCARD_HXX
|
|
||||||
|
|
||||||
#include <rtl/ustring.hxx>
|
|
||||||
|
|
||||||
namespace framework{
|
|
||||||
|
|
||||||
/*-************************************************************************************************************
|
|
||||||
@short implement wildcard-mechanism for unicode
|
|
||||||
@descr This class can be used to get information about the matching of a pattern to a given text.
|
|
||||||
It's suitable for 8-Bit- AND 16-Bit-strings!
|
|
||||||
@ATTENTION This class isn't threadsafe!
|
|
||||||
|
|
||||||
@devstatus deprecated
|
|
||||||
*//*-*************************************************************************************************************/
|
|
||||||
|
|
||||||
class Wildcard
|
|
||||||
{
|
|
||||||
|
|
||||||
// public methods
|
|
||||||
|
|
||||||
public:
|
|
||||||
|
|
||||||
// constructor / destructor
|
|
||||||
|
|
||||||
/*-****************************************************************************************************
|
|
||||||
@short standard ctor
|
|
||||||
@descr We do nothing here.
|
|
||||||
*//*-*****************************************************************************************************/
|
|
||||||
|
|
||||||
Wildcard();
|
|
||||||
|
|
||||||
/*-****************************************************************************************************
|
|
||||||
@short standard dtor
|
|
||||||
@descr We do nothing here.
|
|
||||||
*//*-*****************************************************************************************************/
|
|
||||||
|
|
||||||
virtual ~Wildcard();
|
|
||||||
|
|
||||||
}; // class Wildcard
|
|
||||||
|
|
||||||
} // namespace framework
|
|
||||||
|
|
||||||
#endif // INCLUDED_FRAMEWORK_INC_CLASSES_WILDCARD_HXX
|
|
||||||
|
|
||||||
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
|
@ -234,33 +234,6 @@ class WeakChangesListener : public ::cppu::WeakImplHelper<css::util::XChangesLis
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
class WeakEventListener : public ::cppu::WeakImplHelper<css::lang::XEventListener>
|
|
||||||
{
|
|
||||||
private:
|
|
||||||
css::uno::WeakReference<css::lang::XEventListener> mxOwner;
|
|
||||||
|
|
||||||
public:
|
|
||||||
WeakEventListener(css::uno::Reference<css::lang::XEventListener> xOwner)
|
|
||||||
: mxOwner(xOwner)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual ~WeakEventListener()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
// lang.XEventListener
|
|
||||||
virtual void SAL_CALL disposing(const css::lang::EventObject& rEvent)
|
|
||||||
throw(css::uno::RuntimeException, std::exception) override
|
|
||||||
{
|
|
||||||
css::uno::Reference<css::lang::XEventListener> xOwner(mxOwner.get(),
|
|
||||||
css::uno::UNO_QUERY);
|
|
||||||
if (xOwner.is())
|
|
||||||
xOwner->disposing(rEvent);
|
|
||||||
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
class WeakDocumentEventListener : public ::cppu::WeakImplHelper<css::document::XDocumentEventListener>
|
class WeakDocumentEventListener : public ::cppu::WeakImplHelper<css::document::XDocumentEventListener>
|
||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
|
@ -1,301 +0,0 @@
|
|||||||
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
||||||
/*
|
|
||||||
* This file is part of the LibreOffice project.
|
|
||||||
*
|
|
||||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
||||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
||||||
*
|
|
||||||
* This file incorporates work covered by the following license notice:
|
|
||||||
*
|
|
||||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
||||||
* contributor license agreements. See the NOTICE file distributed
|
|
||||||
* with this work for additional information regarding copyright
|
|
||||||
* ownership. The ASF licenses this file to you under the Apache
|
|
||||||
* License, Version 2.0 (the "License"); you may not use this file
|
|
||||||
* except in compliance with the License. You may obtain a copy of
|
|
||||||
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef INCLUDED_FRAMEWORK_INC_QUERIES_H
|
|
||||||
#define INCLUDED_FRAMEWORK_INC_QUERIES_H
|
|
||||||
|
|
||||||
#include "general.h"
|
|
||||||
|
|
||||||
#include <rtl/ustring.hxx>
|
|
||||||
#include <rtl/ustrbuf.hxx>
|
|
||||||
|
|
||||||
namespace framework{
|
|
||||||
|
|
||||||
/*-************************************************************************************************************
|
|
||||||
@short These values describe our supported queries for type, filter ... properties.
|
|
||||||
They are used by our FilterFactory or our TypeDetection to return
|
|
||||||
subsets of our cached configuration.
|
|
||||||
*//*-*************************************************************************************************************/
|
|
||||||
#define BASE_QUERY_ALL "_query_all"
|
|
||||||
#define BASE_QUERY_WRITER "_query_Writer"
|
|
||||||
#define BASE_QUERY_WEB "_query_web"
|
|
||||||
#define BASE_QUERY_GLOBAL "_query_global"
|
|
||||||
#define BASE_QUERY_CHART "_query_chart"
|
|
||||||
#define BASE_QUERY_CALC "_query_calc"
|
|
||||||
#define BASE_QUERY_IMPRESS "_query_impress"
|
|
||||||
#define BASE_QUERY_DRAW "_query_draw"
|
|
||||||
#define BASE_QUERY_MATH "_query_math"
|
|
||||||
#define BASE_QUERY_GRAPHICS "_query_graphics"
|
|
||||||
|
|
||||||
/*-************************************************************************************************************
|
|
||||||
@short These parameters can be used in combination with BASE_QUERY_... defines to
|
|
||||||
specialize it.
|
|
||||||
use follow syntax to do so: "<query>[:<param>[=<value>]]"
|
|
||||||
e.g.: "_query_writer:default_first:use_order:sort_prop=uiname"
|
|
||||||
|
|
||||||
argument description default
|
|
||||||
-----------------------------------------------------------------------------------------------
|
|
||||||
iflags=<mask> include filters by given mask 0
|
|
||||||
eflags=<mask> exclude filters by given mask 0
|
|
||||||
sort_prop=<[name,uiname]> sort by internal name or uiname name
|
|
||||||
descending sort descending false
|
|
||||||
use_order use order flag of filters for sorting false
|
|
||||||
default_first set default filter on top of return list false
|
|
||||||
case_sensitive compare "sort_prop" case sensitive false
|
|
||||||
*//*-*************************************************************************************************************/
|
|
||||||
#define SEPARATOR_QUERYPARAM ((sal_Unicode)':')
|
|
||||||
#define SEPARATOR_QUERYPARAMVALUE ((sal_Unicode)'=')
|
|
||||||
|
|
||||||
#define QUERYPARAM_IFLAGS "iflags"
|
|
||||||
#define QUERYPARAM_EFLAGS "eflags"
|
|
||||||
#define QUERYPARAM_SORT_PROP "sort_prop"
|
|
||||||
|
|
||||||
#define QUERYPARAM_DESCENDING "descending"
|
|
||||||
#define QUERYPARAM_USE_ORDER "use_order"
|
|
||||||
#define QUERYPARAM_DEFAULT_FIRST "default_first"
|
|
||||||
#define QUERYPARAM_CASE_SENSITIVE "case_sensitive"
|
|
||||||
|
|
||||||
#define QUERYPARAMVALUE_SORT_PROP_NAME "name"
|
|
||||||
#define QUERYPARAMVALUE_SORT_PROP_UINAME "uiname"
|
|
||||||
|
|
||||||
/*-************************************************************************************************************
|
|
||||||
@short Helper class to support easy building of a query statements.
|
|
||||||
*//*-*************************************************************************************************************/
|
|
||||||
class QueryBuilder
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
|
|
||||||
// start with empty query
|
|
||||||
|
|
||||||
QueryBuilder()
|
|
||||||
{
|
|
||||||
resetAll();
|
|
||||||
}
|
|
||||||
|
|
||||||
// forget all setted params and start with empty ones
|
|
||||||
// Attention: base of query isn't changed!
|
|
||||||
|
|
||||||
void resetParams()
|
|
||||||
{
|
|
||||||
m_sParams.makeStringAndClear();
|
|
||||||
m_sParams.ensureCapacity( 256 );
|
|
||||||
}
|
|
||||||
|
|
||||||
// start with new empty query
|
|
||||||
|
|
||||||
void resetAll()
|
|
||||||
{
|
|
||||||
m_sBase.clear();
|
|
||||||
resetParams();
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
|
||||||
OUString m_sBase;
|
|
||||||
OUStringBuffer m_sParams;
|
|
||||||
|
|
||||||
}; // class QueryBuilder
|
|
||||||
|
|
||||||
/*-************************************************************************************************************
|
|
||||||
@short Helper class to analyze queries and split into his different parts (base, params and values).
|
|
||||||
*//*-*************************************************************************************************************/
|
|
||||||
class QueryAnalyzer
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
|
|
||||||
// it's will not perform to compare strings as query type ...
|
|
||||||
// so we convert it into these enum values.
|
|
||||||
// default = E_ALL!
|
|
||||||
|
|
||||||
enum EQuery
|
|
||||||
{
|
|
||||||
E_ALL ,
|
|
||||||
E_WRITER ,
|
|
||||||
E_WEB ,
|
|
||||||
E_GLOBAL ,
|
|
||||||
E_CHART ,
|
|
||||||
E_CALC ,
|
|
||||||
E_IMPRESS ,
|
|
||||||
E_DRAW ,
|
|
||||||
E_MATH ,
|
|
||||||
E_GRAPHICS
|
|
||||||
};
|
|
||||||
|
|
||||||
// these are valid values for param "sort_prop".
|
|
||||||
// other ones are not supported!
|
|
||||||
// default = E_NAME
|
|
||||||
|
|
||||||
enum ESortProp
|
|
||||||
{
|
|
||||||
E_NAME ,
|
|
||||||
E_UINAME
|
|
||||||
};
|
|
||||||
|
|
||||||
// analyze given query and split it into his different parts; <base>:<param1>:<param2=value>...
|
|
||||||
|
|
||||||
QueryAnalyzer(const OUString& sQuery)
|
|
||||||
// Don't forget to set default values for non given params!
|
|
||||||
: m_eQuery ( E_ALL ) // return ALL filter ...
|
|
||||||
, m_nIFlags ( 0 ) // which has set ANY flag ... (we remove all entries which match with these mask .. => 0!)
|
|
||||||
, m_nEFlags ( 0 ) // (only used, if nIFlags==0 and himself!=0!)
|
|
||||||
, m_eSortProp ( E_NAME ) // sort it by internal name ...
|
|
||||||
, m_bDescending ( sal_False ) // in ascending order ...
|
|
||||||
, m_bCaseSensitive( sal_False ) // ignore case ...
|
|
||||||
, m_bUseOrder ( sal_False ) // don't use order flag ...
|
|
||||||
, m_bDefaultFirst ( sal_False ) // and don't handle default entries in special case!
|
|
||||||
{
|
|
||||||
// Translate old query format to new one first!
|
|
||||||
OUString sNewQuery( sQuery );
|
|
||||||
if (sQuery == "_filterquery_textdocument_withdefault")
|
|
||||||
sNewQuery = "_query_writer:default_first:use_order:sort_prop=uiname";
|
|
||||||
else if (sQuery == "_filterquery_webdocument_withdefault")
|
|
||||||
sNewQuery = "_query_web:default_first:use_order:sort_prop=uiname";
|
|
||||||
else if (sQuery == "_filterquery_globaldocument_withdefault")
|
|
||||||
sNewQuery = "_query_global:default_first:use_order:sort_prop=uiname";
|
|
||||||
else if (sQuery == "_filterquery_chartdocument_withdefault")
|
|
||||||
sNewQuery = "_query_chart:default_first:use_order:sort_prop=uiname";
|
|
||||||
else if (sQuery == "_filterquery_spreadsheetdocument_withdefault")
|
|
||||||
sNewQuery = "_query_calc:default_first:use_order:sort_prop=uiname";
|
|
||||||
else if (sQuery == "_filterquery_presentationdocument_withdefault")
|
|
||||||
sNewQuery = "_query_impress:default_first:use_order:sort_prop=uiname";
|
|
||||||
else if (sQuery == "_filterquery_drawingdocument_withdefault")
|
|
||||||
sNewQuery = "_query_draw:default_first:use_order:sort_prop=uiname";
|
|
||||||
else if (sQuery == "_filterquery_formulaproperties_withdefault")
|
|
||||||
sNewQuery = "_query_math:default_first:use_order:sort_prop=uiname";
|
|
||||||
else if (sQuery == "_filterquery_textdocument")
|
|
||||||
sNewQuery = "_query_writer:use_order:sort_prop=uiname";
|
|
||||||
else if (sQuery == "_filterquery_webdocument")
|
|
||||||
sNewQuery = "_query_web:use_order:sort_prop=uiname";
|
|
||||||
else if (sQuery == "_filterquery_globaldocument")
|
|
||||||
sNewQuery = "_query_global:use_order:sort_prop=uiname";
|
|
||||||
else if (sQuery == "_filterquery_chartdocument")
|
|
||||||
sNewQuery = "_query_chart:use_order:sort_prop=uiname";
|
|
||||||
else if (sQuery == "_filterquery_spreadsheetdocument")
|
|
||||||
sNewQuery = "_query_calc:use_order:sort_prop=uiname";
|
|
||||||
else if (sQuery == "_filterquery_presentationdocument")
|
|
||||||
sNewQuery = "_query_impress:use_order:sort_prop=uiname";
|
|
||||||
else if (sQuery == "_filterquery_drawingdocument")
|
|
||||||
sNewQuery = "_query_draw:use_order:sort_prop=uiname";
|
|
||||||
else if (sQuery == "_filterquery_formulaproperties")
|
|
||||||
sNewQuery = "_query_math:use_order:sort_prop=uiname";
|
|
||||||
|
|
||||||
// Analyze query ...
|
|
||||||
// Try to find base of it and safe it for faster access as enum value!
|
|
||||||
sal_Int32 nToken = 0;
|
|
||||||
OUString sParam;
|
|
||||||
OUString sBase = sNewQuery.getToken( 0, SEPARATOR_QUERYPARAM, nToken );
|
|
||||||
|
|
||||||
if (sBase.equalsIgnoreAsciiCase(BASE_QUERY_ALL))
|
|
||||||
m_eQuery = E_ALL;
|
|
||||||
else if( sBase.equalsIgnoreAsciiCase(BASE_QUERY_WRITER))
|
|
||||||
m_eQuery = E_WRITER;
|
|
||||||
else if( sBase.equalsIgnoreAsciiCase(BASE_QUERY_WEB))
|
|
||||||
m_eQuery = E_WEB;
|
|
||||||
else if( sBase.equalsIgnoreAsciiCase(BASE_QUERY_GLOBAL))
|
|
||||||
m_eQuery = E_GLOBAL;
|
|
||||||
else if( sBase.equalsIgnoreAsciiCase(BASE_QUERY_CHART))
|
|
||||||
m_eQuery = E_CHART;
|
|
||||||
else if( sBase.equalsIgnoreAsciiCase(BASE_QUERY_CALC))
|
|
||||||
m_eQuery = E_CALC;
|
|
||||||
else if( sBase.equalsIgnoreAsciiCase(BASE_QUERY_IMPRESS))
|
|
||||||
m_eQuery = E_IMPRESS;
|
|
||||||
else if( sBase.equalsIgnoreAsciiCase(BASE_QUERY_DRAW))
|
|
||||||
m_eQuery = E_DRAW;
|
|
||||||
else if( sBase.equalsIgnoreAsciiCase(BASE_QUERY_MATH))
|
|
||||||
m_eQuery = E_MATH;
|
|
||||||
else if( sBase.equalsIgnoreAsciiCase(BASE_QUERY_GRAPHICS))
|
|
||||||
m_eQuery = E_GRAPHICS;
|
|
||||||
|
|
||||||
// Try to get additional parameters ...
|
|
||||||
while( nToken >= 0 )
|
|
||||||
{
|
|
||||||
sParam = sNewQuery.getToken( 0, SEPARATOR_QUERYPARAM, nToken );
|
|
||||||
// "default_first"
|
|
||||||
if( sParam.startsWith( QUERYPARAM_DEFAULT_FIRST ) )
|
|
||||||
{
|
|
||||||
m_bDefaultFirst = sal_True;
|
|
||||||
}
|
|
||||||
// "use_order"
|
|
||||||
else if( sParam.startsWith( QUERYPARAM_USE_ORDER ) )
|
|
||||||
{
|
|
||||||
m_bUseOrder = sal_True;
|
|
||||||
}
|
|
||||||
// "descending"
|
|
||||||
else if( sParam.startsWith( QUERYPARAM_DESCENDING ) )
|
|
||||||
{
|
|
||||||
m_bDescending = sal_True;
|
|
||||||
}
|
|
||||||
// "case_sensitive"
|
|
||||||
else if( sParam.startsWith( QUERYPARAM_CASE_SENSITIVE ) )
|
|
||||||
{
|
|
||||||
m_bCaseSensitive = sal_True;
|
|
||||||
}
|
|
||||||
// "iflags=<mask>"
|
|
||||||
else if( sParam.startsWith( QUERYPARAM_IFLAGS ) )
|
|
||||||
{
|
|
||||||
sal_Int32 nSubToken = 0;
|
|
||||||
sParam.getToken( 0, SEPARATOR_QUERYPARAMVALUE, nSubToken );
|
|
||||||
if( nSubToken > 0 )
|
|
||||||
{
|
|
||||||
m_nIFlags = sParam.getToken( 0, SEPARATOR_QUERYPARAMVALUE, nSubToken ).toInt32();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// "eflags=<mask>"
|
|
||||||
else if( sParam.startsWith( QUERYPARAM_EFLAGS ) )
|
|
||||||
{
|
|
||||||
sal_Int32 nSubToken = 0;
|
|
||||||
sParam.getToken( 0, SEPARATOR_QUERYPARAMVALUE, nSubToken );
|
|
||||||
if( nSubToken > 0 )
|
|
||||||
{
|
|
||||||
m_nEFlags = sParam.getToken( 0, SEPARATOR_QUERYPARAMVALUE, nSubToken ).toInt32();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// "sort_prop=<[name,uiname]>"
|
|
||||||
else if( sParam.startsWith( QUERYPARAM_SORT_PROP ) )
|
|
||||||
{
|
|
||||||
sal_Int32 nSubToken = 0;
|
|
||||||
sParam.getToken( 0, SEPARATOR_QUERYPARAMVALUE, nSubToken );
|
|
||||||
if( nSubToken > 0 )
|
|
||||||
{
|
|
||||||
OUString sParamValue = sParam.getToken( 0, SEPARATOR_QUERYPARAMVALUE, nSubToken );
|
|
||||||
if( sParamValue.startsWith( QUERYPARAMVALUE_SORT_PROP_NAME ) )
|
|
||||||
m_eSortProp = E_NAME;
|
|
||||||
else if( sParamValue.startsWith( QUERYPARAMVALUE_SORT_PROP_UINAME ) )
|
|
||||||
m_eSortProp = E_UINAME;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
|
||||||
EQuery m_eQuery;
|
|
||||||
sal_uInt32 m_nIFlags;
|
|
||||||
sal_uInt32 m_nEFlags;
|
|
||||||
ESortProp m_eSortProp;
|
|
||||||
bool m_bDescending;
|
|
||||||
bool m_bCaseSensitive;
|
|
||||||
bool m_bUseOrder;
|
|
||||||
bool m_bDefaultFirst;
|
|
||||||
|
|
||||||
}; // class QueryAnalyzer
|
|
||||||
|
|
||||||
} // namespace framework
|
|
||||||
|
|
||||||
#endif // INCLUDED_FRAMEWORK_INC_QUERIES_H
|
|
||||||
|
|
||||||
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
|
@ -82,7 +82,6 @@ class FWI_DLLPUBLIC ItemContainer : public ::cppu::WeakImplHelper< css::contai
|
|||||||
throw (css::uno::RuntimeException, std::exception) override;
|
throw (css::uno::RuntimeException, std::exception) override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
ItemContainer();
|
|
||||||
void copyItemContainer( const std::vector< css::uno::Sequence< css::beans::PropertyValue > >& rSourceVector, const ShareableMutex& rMutex );
|
void copyItemContainer( const std::vector< css::uno::Sequence< css::beans::PropertyValue > >& rSourceVector, const ShareableMutex& rMutex );
|
||||||
css::uno::Reference< css::container::XIndexAccess > deepCopyContainer( const css::uno::Reference< css::container::XIndexAccess >& rSubContainer, const ShareableMutex& rMutex );
|
css::uno::Reference< css::container::XIndexAccess > deepCopyContainer( const css::uno::Reference< css::container::XIndexAccess >& rSubContainer, const ShareableMutex& rMutex );
|
||||||
|
|
||||||
|
@ -51,8 +51,6 @@ class StatusIndicatorInterfaceWrapper : public ::cppu::WeakImplHelper< css::ta
|
|||||||
virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( css::uno::RuntimeException, std::exception ) override;
|
virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( css::uno::RuntimeException, std::exception ) override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
StatusIndicatorInterfaceWrapper();
|
|
||||||
|
|
||||||
css::uno::WeakReference< css::lang::XComponent > m_xStatusIndicatorImpl;
|
css::uno::WeakReference< css::lang::XComponent > m_xStatusIndicatorImpl;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -61,17 +61,6 @@ class ActionLockGuard
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
/** @short initialize new guard instance and lock the given resource immediately.
|
|
||||||
|
|
||||||
@param xLock
|
|
||||||
points to the outside resource, which should be locked.
|
|
||||||
*/
|
|
||||||
ActionLockGuard(const css::uno::Reference< css::document::XActionLockable >& xLock)
|
|
||||||
: m_bActionLocked(false)
|
|
||||||
{
|
|
||||||
setResource(xLock);
|
|
||||||
}
|
|
||||||
|
|
||||||
/** @short release this guard instance and make sure, that no lock
|
/** @short release this guard instance and make sure, that no lock
|
||||||
will exist afterwards on the internal wrapped resource.
|
will exist afterwards on the internal wrapped resource.
|
||||||
*/
|
*/
|
||||||
|
@ -20,7 +20,6 @@
|
|||||||
#include <sal/types.h>
|
#include <sal/types.h>
|
||||||
|
|
||||||
#include <services/desktop.hxx>
|
#include <services/desktop.hxx>
|
||||||
#include <classes/filtercache.hxx>
|
|
||||||
#include <protocols.h>
|
#include <protocols.h>
|
||||||
#include <general.h>
|
#include <general.h>
|
||||||
|
|
||||||
|
@ -83,7 +83,6 @@ class MzString
|
|||||||
public:
|
public:
|
||||||
MzString(); // Create an empty string
|
MzString(); // Create an empty string
|
||||||
// if len = 0, len becomes s.length)
|
// if len = 0, len becomes s.length)
|
||||||
MzString(MzString const &s, int len = 0);
|
|
||||||
~MzString();
|
~MzString();
|
||||||
|
|
||||||
int length() const;
|
int length() const;
|
||||||
|
@ -35,7 +35,6 @@ class SvBOOL
|
|||||||
bSet:1;
|
bSet:1;
|
||||||
public:
|
public:
|
||||||
SvBOOL() { bSet = bVal = false; }
|
SvBOOL() { bSet = bVal = false; }
|
||||||
SvBOOL( bool b ) : bVal( b ), bSet( true ) {}
|
|
||||||
SvBOOL( bool b, bool bSetP ) : bVal( b ), bSet( bSetP ) {}
|
SvBOOL( bool b, bool bSetP ) : bVal( b ), bSet( bSetP ) {}
|
||||||
SvBOOL & operator = ( bool n ) { bVal = n; bSet = true; return *this; }
|
SvBOOL & operator = ( bool n ) { bVal = n; bSet = true; return *this; }
|
||||||
|
|
||||||
|
@ -59,7 +59,6 @@ public:
|
|||||||
void SetColumn( sal_uLong nColumnP ) { nColumn = nColumnP; }
|
void SetColumn( sal_uLong nColumnP ) { nColumn = nColumnP; }
|
||||||
sal_uLong GetColumn() const { return nColumn; }
|
sal_uLong GetColumn() const { return nColumn; }
|
||||||
|
|
||||||
bool IsEmpty() const { return nType == SVTOKENTYPE::Empty; }
|
|
||||||
bool IsComment() const { return nType == SVTOKENTYPE::Comment; }
|
bool IsComment() const { return nType == SVTOKENTYPE::Comment; }
|
||||||
bool IsInteger() const { return nType == SVTOKENTYPE::Integer; }
|
bool IsInteger() const { return nType == SVTOKENTYPE::Integer; }
|
||||||
bool IsString() const { return nType == SVTOKENTYPE::String; }
|
bool IsString() const { return nType == SVTOKENTYPE::String; }
|
||||||
@ -86,8 +85,6 @@ public:
|
|||||||
|
|
||||||
void SetHash( SvStringHashEntry * pHashP )
|
void SetHash( SvStringHashEntry * pHashP )
|
||||||
{ pHash = pHashP; nType = SVTOKENTYPE::HashId; }
|
{ pHash = pHashP; nType = SVTOKENTYPE::HashId; }
|
||||||
bool HasHash() const
|
|
||||||
{ return nType == SVTOKENTYPE::HashId; }
|
|
||||||
bool Is( SvStringHashEntry * pEntry ) const
|
bool Is( SvStringHashEntry * pEntry ) const
|
||||||
{ return IsIdentifierHash() && pHash == pEntry; }
|
{ return IsIdentifierHash() && pHash == pEntry; }
|
||||||
};
|
};
|
||||||
@ -190,17 +187,6 @@ public:
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool ReadIf( SvStringHashEntry* pEntry )
|
|
||||||
{
|
|
||||||
if( GetToken().Is( pEntry ) )
|
|
||||||
{
|
|
||||||
GetToken_Next();
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool ReadIfDelimiter()
|
bool ReadIfDelimiter()
|
||||||
{
|
{
|
||||||
if( GetToken().IsChar()
|
if( GetToken().IsChar()
|
||||||
|
@ -80,7 +80,6 @@ public:
|
|||||||
virtual void Clear();
|
virtual void Clear();
|
||||||
|
|
||||||
static SbxBase* Load( SvStream& );
|
static SbxBase* Load( SvStream& );
|
||||||
static void Skip( SvStream& );
|
|
||||||
bool Store( SvStream& );
|
bool Store( SvStream& );
|
||||||
virtual bool LoadCompleted();
|
virtual bool LoadCompleted();
|
||||||
|
|
||||||
|
@ -69,21 +69,7 @@ struct SbxValues
|
|||||||
|
|
||||||
SbxValues(): pData( nullptr ), eType(SbxEMPTY) {}
|
SbxValues(): pData( nullptr ), eType(SbxEMPTY) {}
|
||||||
SbxValues( SbxDataType e ): eType(e) {}
|
SbxValues( SbxDataType e ): eType(e) {}
|
||||||
SbxValues( char _nChar ): nChar( _nChar ), eType(SbxCHAR) {}
|
|
||||||
SbxValues( sal_uInt8 _nByte ): nByte( _nByte ), eType(SbxBYTE) {}
|
|
||||||
SbxValues( short _nInteger ): nInteger( _nInteger ), eType(SbxINTEGER ) {}
|
|
||||||
SbxValues( long _nLong ): nLong( _nLong ), eType(SbxLONG) {}
|
|
||||||
SbxValues( sal_uInt16 _nUShort ): nUShort( _nUShort ), eType(SbxUSHORT) {}
|
|
||||||
SbxValues( sal_uIntPtr _nULong ): nULong( _nULong ), eType(SbxULONG) {}
|
|
||||||
SbxValues( int _nInt ): nInt( _nInt ), eType(SbxINT) {}
|
|
||||||
SbxValues( unsigned int _nUInt ): nUInt( _nUInt ), eType(SbxUINT) {}
|
|
||||||
SbxValues( float _nSingle ): nSingle( _nSingle ), eType(SbxSINGLE) {}
|
|
||||||
SbxValues( double _nDouble ): nDouble( _nDouble ), eType(SbxDOUBLE) {}
|
SbxValues( double _nDouble ): nDouble( _nDouble ), eType(SbxDOUBLE) {}
|
||||||
SbxValues( const OUString* _pString ): pOUString( const_cast<OUString*>(_pString) ), eType(SbxSTRING) {}
|
|
||||||
SbxValues( SbxBase* _pObj ): pObj( _pObj ), eType(SbxOBJECT) {}
|
|
||||||
SbxValues( sal_Unicode* _pChar ): pChar( _pChar ), eType(SbxLPSTR) {}
|
|
||||||
SbxValues( void* _pData ): pData( _pData ), eType(SbxPOINTER) {}
|
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
class BASIC_DLLPUBLIC SbxValue : public SbxBase
|
class BASIC_DLLPUBLIC SbxValue : public SbxBase
|
||||||
|
@ -61,9 +61,6 @@ namespace comphelper
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
IKeyPredicateLess const & m_predicate;
|
IKeyPredicateLess const & m_predicate;
|
||||||
|
|
||||||
private:
|
|
||||||
LessPredicateAdapter(); // never implemented
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
@ -60,14 +60,6 @@ namespace comphelper
|
|||||||
/// the function to create a factory for the component (usually <code>::cppu::createSingleComponentFactory</code>)
|
/// the function to create a factory for the component (usually <code>::cppu::createSingleComponentFactory</code>)
|
||||||
FactoryInstantiation pFactoryCreationFunc;
|
FactoryInstantiation pFactoryCreationFunc;
|
||||||
|
|
||||||
ComponentDescription()
|
|
||||||
:sImplementationName()
|
|
||||||
,aSupportedServices()
|
|
||||||
,pComponentCreationFunc( nullptr )
|
|
||||||
,pFactoryCreationFunc( nullptr )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
ComponentDescription(
|
ComponentDescription(
|
||||||
const OUString& _rImplementationName,
|
const OUString& _rImplementationName,
|
||||||
const css::uno::Sequence< OUString >& _rSupportedServices,
|
const css::uno::Sequence< OUString >& _rSupportedServices,
|
||||||
|
@ -144,7 +144,6 @@ public:
|
|||||||
bool MoveEmbeddedObject( const OUString& rName, EmbeddedObjectContainer& );
|
bool MoveEmbeddedObject( const OUString& rName, EmbeddedObjectContainer& );
|
||||||
|
|
||||||
// get the stored representation for the object
|
// get the stored representation for the object
|
||||||
css::uno::Reference < css::io::XInputStream > GetObjectStream( const css::uno::Reference < css::embed::XEmbeddedObject >& );
|
|
||||||
css::uno::Reference < css::io::XInputStream > GetObjectStream( const OUString& aName, OUString* pMediaType );
|
css::uno::Reference < css::io::XInputStream > GetObjectStream( const OUString& aName, OUString* pMediaType );
|
||||||
|
|
||||||
// get the stored graphical representation for the object
|
// get the stored graphical representation for the object
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user