loplugin:unusedfields various

Change-Id: I59d9f7f73677358b4ae57efda965d43718bdf0d5
This commit is contained in:
Noel Grandin
2015-11-25 13:57:29 +02:00
parent 3e6ba91e2d
commit 1f86864e97
45 changed files with 66 additions and 244 deletions
@@ -150,10 +150,6 @@ protected:
sal_Int32 m_nCurSelectedPos;
/// The currently selected item.
css::uno::WeakReference< css::accessibility::XAccessible>
m_xSelectedItem;
virtual ~VCLXAccessibleList();
/** This function is called from the implementation helper during a
-7
View File
@@ -40,13 +40,6 @@ class MacroSnippet
mpMod = mpBasic->MakeModule( "TestModule", sSource );
}
public:
struct ErrorDetail
{
OUString sErrorText;
int nLine;
int nCol;
ErrorDetail() : nLine(0), nCol(0) {}
};
explicit MacroSnippet(const OUString& sSource)
: mbError(false)
+1 -3
View File
@@ -29,12 +29,10 @@ namespace canvas
{
::basegfx::B2IPoint maPos;
::basegfx::B2ISize maSize;
::basegfx::B2IPoint maBackup;
explicit SurfaceRect( const ::basegfx::B2ISize &rSize ) :
maPos(),
maSize(rSize),
maBackup()
maSize(rSize)
{
}
@@ -456,7 +456,6 @@ private:
private:
mutable ::apphelper::LifeTimeManager m_aLifeTimeManager;
mutable ::osl::Mutex m_aControllerMutex;
bool m_bSuspended;
bool m_bCanClose;
@@ -186,8 +186,6 @@ protected:
void fireModifyEvent();
mutable ::osl::Mutex m_aMutex;
// <properties>
sal_Int32 m_nNumberFormatKey;
OUString m_sRole;
+2 -1
View File
@@ -68,7 +68,8 @@ for d in definitionSet:
or srcLoc.startswith("vcl/source/filter/sgfbram.hxx")
or srcLoc.startswith("vcl/inc/unx/XIM.h")
or srcLoc.startswith("vcl/inc/unx/gtk/gloactiongroup.h")
or srcLoc.startswith("include/svl/svdde.hxx")):
or srcLoc.startswith("include/svl/svdde.hxx")
or srcLoc.startswith("lotuswordpro/source/filter/lwpsdwdrawheader.hxx")):
continue
tmp1set.add((clazz + " " + definitionToTypeMap[d], srcLoc))
+3 -6
View File
@@ -160,17 +160,14 @@ const vFieldInfo[] =
struct SvxGeneralTabPage::Row
{
// which row is it?
RowType eRow;
// row label
VclPtr<FixedText> pLabel;
// first and last field in the row (last is exclusive)
unsigned nFirstField, nLastField;
public:
Row (FixedText *pLabel_, RowType eRow_)
: eRow(eRow_)
, pLabel(pLabel_)
Row (FixedText *pLabel_)
: pLabel(pLabel_)
, nFirstField(0)
, nLastField(0)
{
@@ -260,7 +257,7 @@ void SvxGeneralTabPage::InitControls ()
continue;
// creating row
vRows.push_back(std::make_shared<Row>(
get<FixedText>(vRowInfo[iRow].pTextId), eRow));
get<FixedText>(vRowInfo[iRow].pTextId)));
Row& rRow = *vRows.back();
// fields in the row
static unsigned const nFieldCount = SAL_N_ELEMENTS(vFieldInfo);
+1 -2
View File
@@ -76,8 +76,7 @@ namespace dbaccess
protected:
typedef ::std::vector<ORowSetDataColumn*> TDataColumns;
::osl::Mutex* m_pMutex; // this the mutex form the rowset itself
::osl::Mutex m_aRowCountMutex, // mutex for rowcount changes
// we need a extra mutex for columns to prevend deadlock when setting new values
::osl::Mutex // we need a extra mutex for columns to prevend deadlock when setting new values
// for a row
m_aColumnsMutex;
@@ -48,7 +48,6 @@ namespace dbaui
TTableConnectionData m_vTableConnectionData;
TTableWindowData m_vTableData;
Fraction m_aZoom;
::dbtools::SQLExceptionInfo m_aExceptionInfo;
VclPtr<OAddTableDlg> m_pAddTableDialog;
-1
View File
@@ -43,7 +43,6 @@ class ScannerManager:
{
protected:
osl::Mutex maProtector;
void* mpData;
static void AcquireData();
@@ -34,13 +34,6 @@
#include <chart.hxx>
#include <tools/poly.hxx>
struct NodeFrameSet
{
Point nTopLeft;
Point nBottomRight;
css::awt::Size nSize;
};
class CGM;
class CGMBitmapDescriptor;
class CGMOutAct
-2
View File
@@ -90,8 +90,6 @@ class SVGAttributeWriter
private:
vcl::Font maCurFont;
Color maCurLineColor;
Color maCurFillColor;
SVGExport& mrExport;
SVGFontExport& mrFontExport;
SvXMLElementExport* mpElemFont;
@@ -48,7 +48,6 @@ namespace framework
{
css::uno::Reference< css::frame::XDispatch > xDispatch;
css::util::URL aTargetURL;
css::uno::Sequence< css::beans::PropertyValue > aArgs;
};
css::uno::Reference< css::uno::XComponentContext > m_xContext;
css::uno::Reference< css::frame::XDispatchProvider > m_xDispatchProvider;
+1 -3
View File
@@ -27,10 +27,8 @@
struct SvSlotElement
{
SvMetaSlotRef xSlot;
OString aPrefix;
SvSlotElement( SvMetaSlot * pS, const OString& rPrefix )
SvSlotElement( SvMetaSlot * pS )
: xSlot( pS )
, aPrefix( rPrefix )
{
}
};
+2 -2
View File
@@ -544,11 +544,11 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const OString& rPrefix,
{
SvSlotElementList::iterator it = rList.begin();
std::advance( it, nPos );
rList.insert( it, new SvSlotElement( this, rPrefix ) );
rList.insert( it, new SvSlotElement( this ) );
}
else
{
rList.push_back( new SvSlotElement( this, rPrefix ) );
rList.push_back( new SvSlotElement( this ) );
}
// iron out EnumSlots
+1 -2
View File
@@ -290,12 +290,11 @@ public:
OString sTyp;
OString sGID;
OString sLID;
OString sFilename;
MergeEntrys* pMergeEntrys;
private:
MergeDataHashMap::iterator m_aNextData;
public:
MergeData( const OString &rTyp, const OString &rGID, const OString &rLID , const OString &rFilename );
MergeData( const OString &rTyp, const OString &rGID, const OString &rLID );
~MergeData();
MergeEntrys* GetMergeEntries() { return pMergeEntrys;}
+2 -3
View File
@@ -192,11 +192,10 @@ MergeDataHashMap::iterator MergeDataHashMap::find(const OString& rKey)
MergeData::MergeData(
const OString &rTyp, const OString &rGID,
const OString &rLID , const OString &rFilename )
const OString &rLID )
: sTyp( rTyp ),
sGID( rGID ),
sLID( rLID ) ,
sFilename( rFilename ),
pMergeEntrys( new MergeEntrys() )
{
}
@@ -411,7 +410,7 @@ void MergeDataFile::InsertEntry(
if( !pData )
{
pData = new MergeData( rTYP, rGID, rLID, rInFilename );
pData = new MergeData( rTYP, rGID, rLID );
aMap.insert( sKey, pData );
}
-1
View File
@@ -68,7 +68,6 @@ OConnection::OConnection(MysqlCDriver& _rDriver, sql::Driver * _cppDriver)
,cppDriver(_cppDriver)
,m_bClosed(false)
,m_bUseCatalog(false)
,m_bUseOldDateFormat(false)
{
OSL_TRACE("OConnection::OConnection");
m_rDriver.acquire();
-1
View File
@@ -112,7 +112,6 @@ namespace connectivity
bool m_bClosed;
bool m_bUseCatalog; // should we use the catalog on filebased databases
bool m_bUseOldDateFormat;
public:
rtl::OUString getMysqlVariable(const char *varname)
@@ -52,7 +52,6 @@ namespace connectivity
{
protected:
unsigned int m_paramCount; // number of placeholders
sal_Int32 m_nNumParams; // Number of parameter markers for the prepared statement
Reference< XResultSetMetaData > m_xMetaData;
void checkParameterIndex(sal_Int32 parameter);
+35 -137
View File
@@ -43,10 +43,7 @@ TypeInfoDef mysqlc_types[] = {
false, // auto_increment
"BIT", // local type name
0, // minimum scale
0, // maximum scale
0, // sql data type (unsued)
0, // sql datetime sub (unsued)
10 // num prec radix
0 // maximum scale
},
// ------------ MySQL-Type: BOOL. SDBC-Type: Bit -------------
@@ -65,10 +62,7 @@ TypeInfoDef mysqlc_types[] = {
false, // auto_increment
"BOOL", // local type name
0, // minimum scale
0, // maximum scale
0, // sql data type (unsued)
0, // sql datetime sub (unsued)
10 // num prec radix
0 // maximum scale
},
// --------- MySQL-Type: TINYINT SDBC-Type: TINYINT ----------
@@ -87,10 +81,7 @@ TypeInfoDef mysqlc_types[] = {
true, // auto_increment
"TINYINT", // local type name
0, // minimum scale
0, // maximum scale
0, // sql data type (unsued)
0, // sql datetime sub (unsued)
10 // num prec radix
0 // maximum scale
},
// ----------- MySQL-Type: BIGINT SDBC-Type: BIGINT ----------
@@ -109,10 +100,7 @@ TypeInfoDef mysqlc_types[] = {
true, // auto_increment
"BIGINT", // local type name
0, // minimum scale
0, // maximum scale
0, // sql data type (unsued)
0, // sql datetime sub (unsued)
10 // num prec radix
0 // maximum scale
},
// ----------- MySQL-Type: LONG VARBINARY SDBC-Type: LONGVARBINARY ----------
@@ -131,10 +119,7 @@ TypeInfoDef mysqlc_types[] = {
false, // auto_increment
"LONG VARBINARY", // local type name
0, // minimum scale
0, // maximum scale
0, // sql data type (unsued)
0, // sql datetime sub (unsued)
10 // num prec radix
0 // maximum scale
},
// ----------- MySQL-Type: MEDIUMBLOB SDBC-Type: LONGVARBINARY ----------
@@ -153,10 +138,7 @@ TypeInfoDef mysqlc_types[] = {
false, // auto_increment
"MEDIUMBLOB", // local type name
0, // minimum scale
0, // maximum scale
0, // sql data type (unsued)
0, // sql datetime sub (unsued)
10 // num prec radix
0 // maximum scale
},
// ----------- MySQL-Type: LONGBLOB SDBC-Type: LONGVARBINARY ----------
@@ -175,10 +157,7 @@ TypeInfoDef mysqlc_types[] = {
false, // auto_increment
"LONGBLOB", // local type name
0, // minimum scale
0, // maximum scale
0, // sql data type (unsued)
0, // sql datetime sub (unsued)
10 // num prec radix
0 // maximum scale
},
// ----------- MySQL-Type: BLOB SDBC-Type: LONGVARBINARY ----------
@@ -197,10 +176,7 @@ TypeInfoDef mysqlc_types[] = {
false, // auto_increment
"BLOB", // local type name
0, // minimum scale
0, // maximum scale
0, // sql data type (unsued)
0, // sql datetime sub (unsued)
10 // num prec radix
0 // maximum scale
},
// ----------- MySQL-Type: TINYBLOB SDBC-Type: LONGVARBINARY ----------
@@ -219,10 +195,7 @@ TypeInfoDef mysqlc_types[] = {
false, // auto_increment
"TINYBLOB", // local type name
0, // minimum scale
0, // maximum scale
0, // sql data type (unsued)
0, // sql datetime sub (unsued)
10 // num prec radix
0 // maximum scale
},
// ----------- MySQL-Type: VARBINARY SDBC-Type: VARBINARY ----------
@@ -241,10 +214,7 @@ TypeInfoDef mysqlc_types[] = {
false, // auto_increment
"VARBINARY", // local type name
0, // minimum scale
0, // maximum scale
0, // sql data type (unsued)
0, // sql datetime sub (unsued)
10 // num prec radix
0 // maximum scale
},
// ----------- MySQL-Type: BINARY SDBC-Type: BINARY ----------
@@ -263,10 +233,7 @@ TypeInfoDef mysqlc_types[] = {
false, // auto_increment
"VARBINARY", // local type name
0, // minimum scale
0, // maximum scale
0, // sql data type (unsued)
0, // sql datetime sub (unsued)
10 // num prec radix
0 // maximum scale
},
// ----------- MySQL-Type: LONG VARCHAR SDBC-Type: LONG VARCHAR ----------
@@ -285,10 +252,7 @@ TypeInfoDef mysqlc_types[] = {
false, // auto_increment
"LONG VARCHAR", // local type name
0, // minimum scale
0, // maximum scale
0, // sql data type (unsued)
0, // sql datetime sub (unsued)
10 // num prec radix
0 // maximum scale
},
// ----------- MySQL-Type: MEDIUMTEXT SDBC-Type: LONG VARCHAR ----------
@@ -307,10 +271,7 @@ TypeInfoDef mysqlc_types[] = {
false, // auto_increment
"MEDIUMTEXT", // local type name
0, // minimum scale
0, // maximum scale
0, // sql data type (unsued)
0, // sql datetime sub (unsued)
10 // num prec radix
0 // maximum scale
},
// ----------- MySQL-Type: LONGTEXT SDBC-Type: LONG VARCHAR ----------
@@ -329,10 +290,7 @@ TypeInfoDef mysqlc_types[] = {
false, // auto_increment
"LONGTEXT", // local type name
0, // minimum scale
0, // maximum scale
0, // sql data type (unsued)
0, // sql datetime sub (unsued)
10 // num prec radix
0 // maximum scale
},
// ----------- MySQL-Type: TEXT SDBC-Type: LONG VARCHAR ----------
@@ -351,10 +309,7 @@ TypeInfoDef mysqlc_types[] = {
false, // auto_increment
"TEXT", // local type name
0, // minimum scale
0, // maximum scale
0, // sql data type (unsued)
0, // sql datetime sub (unsued)
10 // num prec radix
0 // maximum scale
},
// ----------- MySQL-Type: TINYTEXT SDBC-Type: LONG VARCHAR ----------
@@ -373,10 +328,7 @@ TypeInfoDef mysqlc_types[] = {
false, // auto_increment
"TINYTEXT", // local type name
0, // minimum scale
0, // maximum scale
0, // sql data type (unsued)
0, // sql datetime sub (unsued)
10 // num prec radix
0 // maximum scale
},
// ----------- MySQL-Type: CHAR SDBC-Type: CHAR ----------
@@ -395,10 +347,7 @@ TypeInfoDef mysqlc_types[] = {
false, // auto_increment
"NUMERIC", // local type name
0, // minimum scale
0, // maximum scale
0, // sql data type (unsued)
0, // sql datetime sub (unsued)
10 // num prec radix
0 // maximum scale
},
// ----------- MySQL-Type: DECIMAL SDBC-Type: DECIMAL ----------
@@ -417,10 +366,7 @@ TypeInfoDef mysqlc_types[] = {
true, // auto_increment
"DECIMAL", // local type name
-308, // minimum scale
308, // maximum scale
0, // sql data type (unsued)
0, // sql datetime sub (unsued)
10 // num prec radix
308 // maximum scale
},
// ----------- MySQL-Type: NUMERIC SDBC-Type: NUMERIC ----------
@@ -439,10 +385,7 @@ TypeInfoDef mysqlc_types[] = {
true, // auto_increment
"NUMERIC", // local type name
-308, // minimum scale
308, // maximum scale
0, // sql data type (unsued)
0, // sql datetime sub (unsued)
10 // num prec radix
308 // maximum scale
},
// ----------- MySQL-Type: INTEGER SDBC-Type: INTEGER ----------
@@ -461,10 +404,7 @@ TypeInfoDef mysqlc_types[] = {
true, // auto_increment
"INTEGER", // local type name
0, // minimum scale
0, // maximum scale
0, // sql data type (unsued)
0, // sql datetime sub (unsued)
10 // num prec radix
0 // maximum scale
},
// ----------- MySQL-Type: INT SDBC-Type: INTEGER ----------
@@ -483,10 +423,7 @@ TypeInfoDef mysqlc_types[] = {
true, // auto_increment
"INT", // local type name
0, // minimum scale
0, // maximum scale
0, // sql data type (unsued)
0, // sql datetime sub (unsued)
10 // num prec radix
0 // maximum scale
},
// ----------- MySQL-Type: MEDIUMINT SDBC-Type: INTEGER ----------
@@ -505,10 +442,7 @@ TypeInfoDef mysqlc_types[] = {
true, // auto_increment
"MEDIUMINT", // local type name
0, // minimum scale
0, // maximum scale
0, // sql data type (unsued)
0, // sql datetime sub (unsued)
10 // num prec radix
0 // maximum scale
},
// ----------- MySQL-Type: SMALLINT SDBC-Type: INTEGER ----------
@@ -527,10 +461,7 @@ TypeInfoDef mysqlc_types[] = {
true, // auto_increment
"SMALLINT", // local type name
0, // minimum scale
0, // maximum scale
0, // sql data type (unsued)
0, // sql datetime sub (unsued)
10 // num prec radix
0 // maximum scale
},
// ----------- MySQL-Type: FLOAT SDBC-Type: REAL ----------
@@ -549,10 +480,7 @@ TypeInfoDef mysqlc_types[] = {
true, // auto_increment
"FLOAT", // local type name
-38, // minimum scale
38, // maximum scale
0, // sql data type (unsued)
0, // sql datetime sub (unsued)
10 // num prec radix
38 // maximum scale
},
// ----------- MySQL-Type: DOUBLE SDBC-Type: DOUBLE ----------
@@ -571,10 +499,7 @@ TypeInfoDef mysqlc_types[] = {
true, // auto_increment
"DOUBLE", // local type name
-308, // minimum scale
308, // maximum scale
0, // sql data type (unsued)
0, // sql datetime sub (unsued)
10 // num prec radix
308 // maximum scale
},
// ----------- MySQL-Type: DOUBLE PRECISION SDBC-Type: DOUBLE ----------
@@ -593,10 +518,7 @@ TypeInfoDef mysqlc_types[] = {
true, // auto_increment
"DOUBLE PRECISION", // local type name
-308, // minimum scale
308, // maximum scale
0, // sql data type (unsued)
0, // sql datetime sub (unsued)
10 // num prec radix
308 // maximum scale
},
// ----------- MySQL-Type: REAL SDBC-Type: DOUBLE ----------
@@ -615,10 +537,7 @@ TypeInfoDef mysqlc_types[] = {
true, // auto_increment
"REAL", // local type name
-308, // minimum scale
308, // maximum scale
0, // sql data type (unsued)
0, // sql datetime sub (unsued)
10 // num prec radix
308 // maximum scale
},
// ----------- MySQL-Type: VARCHAR SDBC-Type: VARCHAR ----------
@@ -637,10 +556,7 @@ TypeInfoDef mysqlc_types[] = {
false, // auto_increment
"VARCHAR", // local type name
0, // minimum scale
0, // maximum scale
0, // sql data type (unsued)
0, // sql datetime sub (unsued)
10 // num prec radix
0 // maximum scale
},
// ----------- MySQL-Type: ENUM SDBC-Type: VARCHAR ----------
@@ -659,10 +575,7 @@ TypeInfoDef mysqlc_types[] = {
false, // auto_increment
"ENUM", // local type name
0, // minimum scale
0, // maximum scale
0, // sql data type (unsued)
0, // sql datetime sub (unsued)
10 // num prec radix
0 // maximum scale
},
// ----------- MySQL-Type: SET SDBC-Type: VARCHAR ----------
@@ -681,10 +594,7 @@ TypeInfoDef mysqlc_types[] = {
false, // auto_increment
"SET", // local type name
0, // minimum scale
0, // maximum scale
0, // sql data type (unsued)
0, // sql datetime sub (unsued)
10 // num prec radix
0 // maximum scale
},
// ----------- MySQL-Type: DATE SDBC-Type: DATE ----------
@@ -703,10 +613,7 @@ TypeInfoDef mysqlc_types[] = {
false, // auto_increment
"DATE", // local type name
0, // minimum scale
0, // maximum scale
0, // sql data type (unsued)
0, // sql datetime sub (unsued)
10 // num prec radix
0 // maximum scale
},
// ----------- MySQL-Type: TIME SDBC-Type: TIME ----------
@@ -725,10 +632,7 @@ TypeInfoDef mysqlc_types[] = {
false, // auto_increment
"TIME", // local type name
0, // minimum scale
0, // maximum scale
0, // sql data type (unsued)
0, // sql datetime sub (unsued)
10 // num prec radix
0 // maximum scale
},
// ----------- MySQL-Type: DATETIME SDBC-Type: TIMESTAMP ----------
@@ -747,10 +651,7 @@ TypeInfoDef mysqlc_types[] = {
false, // auto_increment
"DATETIME", // local type name
0, // minimum scale
0, // maximum scale
0, // sql data type (unsued)
0, // sql datetime sub (unsued)
10 // num prec radix
0 // maximum scale
},
// ----------- MySQL-Type: TIMESTAMP SDBC-Type: TIMESTAMP ----------
@@ -769,15 +670,12 @@ TypeInfoDef mysqlc_types[] = {
false, // auto_increment
"TIMESTAMP", // local type name
0, // minimum scale
0, // maximum scale
0, // sql data type (unsued)
0, // sql datetime sub (unsued)
10 // num prec radix
0 // maximum scale
},
// ----------- MySQL-Type: TIMESTAMP SDBC-Type: TIMESTAMP ----------
{
nullptr, 0, 0, nullptr, nullptr, nullptr, 0, false, 0, false, false, false, nullptr, 0, 0, 0, 0, 0
nullptr, 0, 0, nullptr, nullptr, nullptr, 0, false, 0, false, false, false, nullptr, 0, 0
}
};
-3
View File
@@ -36,9 +36,6 @@ struct TypeInfoDef {
const char *localTypeName;
sal_Int32 minScale;
sal_Int32 maxScale;
sal_Int32 sqlDataType;
sal_Int32 sqlDateTimeSub;
sal_Int32 numPrecRadix;
};
extern TypeInfoDef mysqlc_types[];
@@ -112,7 +112,6 @@ private:
OUString m_sTableStyle;
OUString m_sCellStyle;
OUString m_sColumnStyle;
Any m_aPreviewMode;
rtl::Reference < SvXMLExportPropertyMapper> m_xExportHelper;
rtl::Reference < SvXMLExportPropertyMapper> m_xSectionPropMapper;
rtl::Reference < SvXMLExportPropertyMapper> m_xTableStylesExportPropertySetMapper;
-1
View File
@@ -66,7 +66,6 @@ struct RscSysEntry
class RscTypCont
{
rtl_TextEncoding nSourceCharSet;
sal_uInt32 nMachineId; // global machine type
RSCBYTEORDER_TYPE nByteOrder; // Intel oder
OString aLanguage; // output language
std::vector< sal_uInt32 > aLangFallbacks; // language fallback list (entry 0 is language itself)
-2
View File
@@ -87,8 +87,6 @@
typedef struct _oslVolumeDeviceHandleImpl
{
sal_Char pszMountPoint[PATH_MAX];
sal_Char pszFilePath[PATH_MAX];
sal_Char pszDevice[PATH_MAX];
sal_Char ident[4];
sal_uInt32 RefCount;
} oslVolumeDeviceHandleImpl;
-1
View File
@@ -40,7 +40,6 @@ struct oslSocketImpl {
struct oslSocketAddrImpl
{
sal_Int32 m_nRefCount;
struct sockaddr m_sockaddr;
};
-5
View File
@@ -4222,11 +4222,6 @@ void Test::testFuncVLOOKUP()
m_pDoc->DeleteTab(0);
}
struct NumStrCheck {
double fVal;
const char* pRes;
};
struct StrStrCheck {
const char* pVal;
const char* pRes;
+5 -6
View File
@@ -2660,7 +2660,7 @@ DynamicKernelSoPArguments::DynamicKernelSoPArguments(const ScCalcConfig& config,
{
// Can't handle
SAL_INFO("sc.opencl", "Strings but can't do that.");
throw UnhandledToken(pChild, ("unhandled operand " + StackVarEnumToString(pChild->GetType()) + " for ocPush").c_str());
throw UnhandledToken(("unhandled operand " + StackVarEnumToString(pChild->GetType()) + " for ocPush").c_str());
}
else
{
@@ -2751,8 +2751,7 @@ DynamicKernelSoPArguments::DynamicKernelSoPArguments(const ScCalcConfig& config,
else
{
SAL_INFO("sc.opencl", "Fallback case, rejecting for OpenCL");
throw UnhandledToken(pChild,
"Got unhandled case here", __FILE__, __LINE__);
throw UnhandledToken("Got unhandled case here", __FILE__, __LINE__);
}
}
else if (pChild->GetType() == formula::svDouble)
@@ -2773,7 +2772,7 @@ DynamicKernelSoPArguments::DynamicKernelSoPArguments(const ScCalcConfig& config,
else
{
SAL_INFO("sc.opencl", "Fallback case, rejecting for OpenCL");
throw UnhandledToken(pChild, ("unhandled operand " + StackVarEnumToString(pChild->GetType()) + " for ocPush").c_str());
throw UnhandledToken(("unhandled operand " + StackVarEnumToString(pChild->GetType()) + " for ocPush").c_str());
}
break;
case ocDiv:
@@ -3663,11 +3662,11 @@ DynamicKernelSoPArguments::DynamicKernelSoPArguments(const ScCalcConfig& config,
new OpGestep, nResultSize));
}
else
throw UnhandledToken(pChild, "unhandled opcode");
throw UnhandledToken("unhandled opcode");
break;
default:
throw UnhandledToken(pChild, "unhandled opcode");
throw UnhandledToken("unhandled opcode");
}
}
}
+1 -1
View File
@@ -318,7 +318,7 @@ void OpIf::GenSlidingWindowFunction(std::stringstream &ss,
FormulaToken *tmpCur0 = vSubArguments[0]->GetFormulaToken();
if(tmpCur0->GetType() == formula::svDoubleVectorRef)
{
throw UnhandledToken(tmpCur0, "unknown operand for ocPush");
throw UnhandledToken("unknown operand for ocPush");
}
else
{
+2 -2
View File
@@ -16,8 +16,8 @@ using namespace formula;
namespace sc { namespace opencl {
UnhandledToken::UnhandledToken(
formula::FormulaToken* t, const char* m, const std::string& fn, int ln ) :
mToken(t), mMessage(m), mFile(fn), mLineNumber(ln) {}
const char* m, const std::string& fn, int ln ) :
mMessage(m), mFile(fn), mLineNumber(ln) {}
OpenCLError::OpenCLError( const std::string& function, cl_int error, const std::string& file, int line ) :
mFunction(function), mError(error), mFile(file), mLineNumber(line)
+1 -2
View File
@@ -32,9 +32,8 @@ class FormulaTreeNode;
class UnhandledToken
{
public:
UnhandledToken( formula::FormulaToken* t, const char* m, const std::string& fn = "", int ln = 0 );
UnhandledToken( const char* m, const std::string& fn = "", int ln = 0 );
formula::FormulaToken* mToken;
std::string mMessage;
std::string mFile;
int mLineNumber;
-1
View File
@@ -50,7 +50,6 @@ friend class ScVbaAxis;
css::uno::Reference< css::chart::XTwoAxisYSupplier > xTwoAxisYSupplier;
static css::uno::Sequence< OUString > getDefaultSeriesDescriptions( sal_Int32 nCount );
css::uno::Sequence< css::uno::Sequence< double > > dblValues;
void setDefaultChartType()throw ( css::script::BasicErrorException ) ;
void setDiagram( const OUString& _sDiagramType) throw( css::script::BasicErrorException );
bool isStacked() throw ( css::uno::RuntimeException );
@@ -146,13 +146,11 @@ void fillRepeatComboBox( ListBox* pBox )
}
CustomAnimationPane::CustomAnimationPane( Window* pParent, ViewShellBase& rBase,
const css::uno::Reference<css::frame::XFrame>& rxFrame,
const Size& rMinSize )
const css::uno::Reference<css::frame::XFrame>& rxFrame )
: PanelLayout( pParent, "CustomAnimationsPanel", "modules/simpress/ui/customanimationspanel.ui", rxFrame ),
mrBase( rBase ),
mpCustomAnimationPresets(nullptr),
mnPropertyType( nPropertyTypeNone ),
maMinSize( rMinSize ),
mxModel( rBase.GetDocShell()->GetDoc()->getUnoModel(), UNO_QUERY ),
maLateInitTimer()
{
@@ -2278,8 +2276,7 @@ vcl::Window * createCustomAnimationPanel( vcl::Window* pParent, ViewShellBase& r
DrawDocShell* pDocSh = rBase.GetDocShell();
if( pDocSh )
{
const Size aMinSize( pParent->LogicToPixel( Size( 80, 256 ), MAP_APPFONT ) );
pWindow = VclPtr<CustomAnimationPane>::Create( pParent, rBase, rxFrame, aMinSize );
pWindow = VclPtr<CustomAnimationPane>::Create( pParent, rBase, rxFrame );
}
return pWindow;
@@ -62,7 +62,7 @@ class CustomAnimationPane : public PanelLayout, public ICustomAnimationListContr
{
friend class MotionPathTag;
public:
CustomAnimationPane( vcl::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame, const Size& rMinSize );
CustomAnimationPane( vcl::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame );
virtual ~CustomAnimationPane();
virtual void dispose() override;
@@ -151,8 +151,6 @@ private:
sal_Int32 mnPropertyType;
Size maMinSize;
EffectSequence maListSelection;
css::uno::Any maViewSelection;
-3
View File
@@ -43,16 +43,13 @@ namespace sd
struct ClientInfo
{
OUString mName;
OUString mAddress;
bool mbIsAlreadyAuthorised;
enum PROTOCOL { NETWORK = 1, BLUETOOTH };
ClientInfo( const OUString& rName,
const OUString& rAddress,
const bool bIsAlreadyAuthorised ) :
mName( rName ),
mAddress( rAddress ),
mbIsAlreadyAuthorised( bIsAlreadyAuthorised ) {}
virtual ~ClientInfo() {};
-1
View File
@@ -222,7 +222,6 @@ public:
OUString RetrieveLabelFromCommand( const OUString& aCmdURL ) const;
protected:
osl::Mutex maMutex;
virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override;
+3 -5
View File
@@ -53,11 +53,10 @@ namespace sd {
OUString mPin;
ClientInfoInternal( const OUString& rName,
const OUString& rAddress,
const bool bIsAlreadyAuthorised,
BufferedStreamSocket *pSocket,
const OUString& rPin ):
ClientInfo( rName, rAddress, bIsAlreadyAuthorised ),
ClientInfo( rName, bIsAlreadyAuthorised ),
mpStreamSocket( pSocket ),
mPin( rPin ) {}
};
@@ -126,13 +125,12 @@ void RemoteServer::execute()
SocketAddr aClientAddr;
pSocket->getPeerAddr( aClientAddr );
OUString aAddress = aClientAddr.getHostname();
MutexGuard aGuard( sDataMutex );
std::shared_ptr< ClientInfoInternal > pClient(
new ClientInfoInternal(
OStringToOUString( aName, RTL_TEXTENCODING_UTF8 ),
aAddress, false, pSocket, OStringToOUString( aPin,
false, pSocket, OStringToOUString( aPin,
RTL_TEXTENCODING_UTF8 ) ) );
mAvailableClients.push_back( pClient );
@@ -266,7 +264,7 @@ std::vector< std::shared_ptr< ClientInfo > > RemoteServer::getClients()
Sequence< OUString > aNames = xConfig->getElementNames();
for ( int i = 0; i < aNames.getLength(); i++ )
{
aClients.push_back( std::shared_ptr< ClientInfo > ( new ClientInfo( aNames[i], "", true ) ) );
aClients.push_back( std::shared_ptr< ClientInfo > ( new ClientInfo( aNames[i], true ) ) );
}
return aClients;
-2
View File
@@ -337,9 +337,7 @@ private:
std::shared_ptr< AnimationSlideController > mpSlideController;
long mnRestoreSlide;
Point maSlideOrigin;
Point maPopupMousePos;
Size maSlideSize;
Size maPresSize;
AnimationMode meAnimationMode;
OUString maCharBuffer;
@@ -36,7 +36,6 @@ class NoBitmapCompression::DummyReplacement
{
public:
Bitmap maPreview;
Size maOriginalSize;
explicit DummyReplacement (const Bitmap& rPreview) : maPreview(rPreview) { }
virtual ~DummyReplacement() {}
-1
View File
@@ -236,7 +236,6 @@ ViewShellBase::ViewShellBase (
: SfxViewShell (_pFrame,
SfxViewShellFlags::CAN_PRINT
| SfxViewShellFlags::HAS_PRINTOPTIONS),
maMutex(),
mpImpl(),
mpDocShell (nullptr),
mpDocument (nullptr)
+1 -3
View File
@@ -36,10 +36,8 @@ class FileOpenDialog
OUString maType;
OUString maUIName;
sal_Int32 maFlags;
css::uno::Sequence< OUString > maExtensions;
FilterEntry() :
maFlags( 0 ) {}
FilterEntry() : maFlags( 0 ) {}
};
css::uno::Reference < css::ui::dialogs::XFilePicker3 > mxFilePicker;
-1
View File
@@ -54,7 +54,6 @@ struct SfxObjectShell_Impl : public ::sfx2::IMacroDocumentAccess
xBasicLibraries;
css::uno::Reference< css::script::XLibraryContainer >
xDialogLibraries;
css::uno::Sequence < OUString > xEventNames;
::sfx2::DocumentMacroMode
aMacroMode;
SfxProgress* pProgress;
-1
View File
@@ -192,7 +192,6 @@ protected:
VclPtr<SfxActionListBox> aFmtLb;
VclPtr<ListBox> aFilterLb;
Size aSize;
sal_uInt16 nActFamily; // Id in the ToolBox = Position - 1
sal_uInt16 nActFilter; // FilterIdx
-1
View File
@@ -103,7 +103,6 @@ public:
Fraction m_aScaleHeight;
SfxInPlaceClient* m_pClient;
sal_Int64 m_nAspect; // ViewAspect that is assigned from the container
Rectangle m_aLastObjAreaPixel; // area of object in coordinate system of the container (without scaling)
bool m_bStoreObject;
bool m_bUIActive; // set and cleared when notification for UI (de)activation is sent
bool m_bResizeNoScale;
+2 -4
View File
@@ -46,19 +46,17 @@ struct SfxViewShell_Impl
bool m_bControllerSet;
SfxShellArr_Impl aArr;
SvBorder aBorder;
Size aOptimalSize;
Size aMargin;
sal_uInt16 m_nPrinterLocks;
sal_uInt16 m_nPrinterLocks;
bool m_bCanPrint;
bool m_bHasPrintOptions;
bool m_bPlugInsActive;
bool m_bIsShowView;
bool m_bGotOwnership;
bool m_bGotFrameOwnership;
sal_uInt16 m_nFamily;
sal_uInt16 m_nFamily;
::rtl::Reference<SfxBaseController> m_pController;
std::unique_ptr< ::svt::AcceleratorExecute > m_xAccExec;
css::uno::Sequence < css::beans::PropertyValue > aPrintOpts;
::rtl::Reference< SfxClipboardChangeListener > xClipboardListener;
std::shared_ptr< vcl::PrinterController > m_xPrinterController;