[Libreoffice-commits] core.git: 115 commits - basctl/source boost/boost_1_44_0-gcc4.8.patch boost/boost.wdeprecated-auto_ptr.patch.0 boost/UnpackedTarball_boost.mk bridges/source connectivity/source cui/source dbaccess/source editeng/source filter/source forms/source fpicker/source framework/source include/connectivity include/sfx2 linguistic/source lotuswordpro/source oox/source package/source reportdesign/source sal/qa sal/rtl sal/textenc sax/source scaddins/source scripting/source sc/source sdext/source sd/source sfx2/source slideshow/source starmath/source stoc/source svl/source svtools/source svx/source sw/source tools/source unoxml/source vcl/source vcl/unx writerfilter/source xmloff/source xmlsecurity/source
Stephan Bergmann
sbergman at redhat.com
Wed Oct 2 07:50:42 PDT 2013
basctl/source/basicide/bastype2.cxx | 24 ++
basctl/source/basicide/moduldl2.cxx | 4
boost/UnpackedTarball_boost.mk | 1
boost/boost.wdeprecated-auto_ptr.patch.0 | 91 ++++++++
boost/boost_1_44_0-gcc4.8.patch | 4
bridges/source/jni_uno/jni_base.h | 7
connectivity/source/drivers/firebird/DatabaseMetaData.cxx | 11
connectivity/source/drivers/jdbc/JConnection.cxx | 7
connectivity/source/drivers/jdbc/Timestamp.cxx | 2
connectivity/source/drivers/postgresql/pq_databasemetadata.cxx | 14 -
connectivity/source/parse/sqlbison.y | 6
connectivity/source/parse/sqlflex.l | 2
cui/source/dialogs/colorpicker.cxx | 1
cui/source/dialogs/hldoctp.cxx | 1
cui/source/dialogs/passwdomdlg.cxx | 2
cui/source/options/treeopt.cxx | 2
cui/source/tabpages/numpages.cxx | 10
dbaccess/source/ui/dlg/UserAdminDlg.cxx | 2
dbaccess/source/ui/dlg/advancedsettings.cxx | 2
dbaccess/source/ui/dlg/dbadmin.cxx | 2
dbaccess/source/ui/dlg/dbwiz.cxx | 2
dbaccess/source/ui/dlg/dbwizsetup.cxx | 2
editeng/source/misc/svxacorr.cxx | 1
editeng/source/outliner/outliner.cxx | 6
editeng/source/uno/unoedhlp.cxx | 2
filter/source/svg/svgwriter.cxx | 2
forms/source/xforms/submission.cxx | 9
fpicker/source/office/iodlgimp.cxx | 18 -
framework/source/fwe/xml/menudocumenthandler.cxx | 2
framework/source/layoutmanager/layoutmanager.cxx | 6
framework/source/uiconfiguration/imagemanager.cxx | 10
framework/source/uielement/statusbarmerger.cxx | 1
include/connectivity/sqlscan.hxx | 2
include/sfx2/itemconnect.hxx | 4
linguistic/source/convdic.cxx | 4
lotuswordpro/source/filter/localtime.cxx | 1
oox/source/dump/dffdumper.cxx | 1
oox/source/dump/oledumper.cxx | 15 -
oox/source/ole/axbinarywriter.cxx | 1
oox/source/ole/axcontrol.cxx | 14 -
oox/source/ole/olehelper.cxx | 14 -
oox/source/ole/vbacontrol.cxx | 2
package/source/xstor/owriteablestream.cxx | 2
reportdesign/source/ui/dlg/AddField.cxx | 2
reportdesign/source/ui/report/ReportSection.cxx | 2
sal/qa/OStringBuffer/rtl_String_Utils.cxx | 15 -
sal/qa/osl/file/osl_old_test_file.cxx | 9
sal/rtl/bootstrap.cxx | 8
sal/textenc/tables.cxx | 18 -
sal/textenc/textenc.cxx | 2
sax/source/expatwrap/saxwriter.cxx | 17 -
sc/source/core/data/documen2.cxx | 2
sc/source/core/tool/autoform.cxx | 3
sc/source/core/tool/chartlock.cxx | 2
sc/source/core/tool/interpr5.cxx | 3
sc/source/filter/oox/addressconverter.cxx | 14 -
sc/source/filter/oox/autofilterbuffer.cxx | 6
sc/source/filter/oox/biffhelper.cxx | 10
sc/source/filter/oox/commentsbuffer.cxx | 8
sc/source/filter/oox/connectionsbuffer.cxx | 27 --
sc/source/filter/oox/defnamesbuffer.cxx | 23 --
sc/source/filter/oox/drawingmanager.cxx | 69 ------
sc/source/filter/oox/excelhandlers.cxx | 13 -
sc/source/filter/oox/externallinkbuffer.cxx | 7
sc/source/filter/oox/pagesettings.cxx | 12 -
sc/source/filter/oox/pivotcachebuffer.cxx | 9
sc/source/filter/oox/pivottablebuffer.cxx | 50 ----
sc/source/filter/oox/querytablebuffer.cxx | 23 --
sc/source/filter/oox/scenariobuffer.cxx | 9
sc/source/filter/oox/sheetdatacontext.cxx | 24 --
sc/source/filter/oox/stylesbuffer.cxx | 112 ----------
sc/source/filter/oox/themebuffer.cxx | 49 ----
sc/source/filter/oox/viewsettings.cxx | 29 --
sc/source/filter/oox/worksheetfragment.cxx | 6
sc/source/filter/oox/worksheetsettings.cxx | 21 -
sc/source/ui/pagedlg/areasdlg.cxx | 2
sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx | 1
sc/source/ui/unoobj/servuno.cxx | 2
sc/source/ui/vba/vbainterior.cxx | 1
scaddins/source/analysis/bessel.cxx | 5
scripting/source/protocolhandler/scripthandler.cxx | 4
sd/source/core/drawdoc.cxx | 6
sd/source/filter/xml/sdxmlwrp.cxx | 1
sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx | 4
sd/source/ui/accessibility/AccessibleOutlineView.cxx | 2
sd/source/ui/dlg/TemplateScanner.cxx | 2
sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx | 2
sd/source/ui/sidebar/MasterPageContainer.cxx | 4
sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx | 4
sd/source/ui/view/drviews5.cxx | 5
sdext/source/presenter/PresenterNotesView.cxx | 4
sdext/source/presenter/PresenterSlideSorter.cxx | 2
sfx2/source/bastyp/frmhtmlw.cxx | 1
sfx2/source/dialog/backingwindow.cxx | 6
sfx2/source/dialog/securitypage.cxx | 2
sfx2/source/doc/SfxDocumentMetaData.cxx | 10
sfx2/source/sidebar/Deck.cxx | 6
sfx2/source/view/sfxbasecontroller.cxx | 3
slideshow/source/engine/shapes/viewmediashape.cxx | 4
starmath/source/accessibility.cxx | 2
starmath/source/parse.cxx | 16 -
stoc/source/security/access_controller.cxx | 11
stoc/source/security/file_policy.cxx | 12 -
svl/source/misc/inettype.cxx | 59 -----
svl/source/numbers/zformat.cxx | 1
svtools/source/brwbox/editbrowsebox.cxx | 2
svtools/source/config/accessibilityoptions.cxx | 2
svx/source/customshapes/EnhancedCustomShapeGeometry.cxx | 29 --
svx/source/sidebar/nbdtmg.cxx | 1
svx/source/sidebar/tools/ValueSetWithTextControl.cxx | 1
sw/source/core/access/accpara.cxx | 2
sw/source/core/bastyp/calc.cxx | 5
sw/source/core/doc/docnew.cxx | 2
sw/source/core/doc/poolfmt.cxx | 4
sw/source/core/doc/tblafmt.cxx | 3
sw/source/core/edit/autofmt.cxx | 2
sw/source/core/undo/rolbck.cxx | 4
sw/source/core/unocore/unoevent.cxx | 7
sw/source/filter/html/svxcss1.cxx | 10
sw/source/ui/dbui/dbinsdlg.cxx | 4
sw/source/ui/dbui/dbmgr.cxx | 2
sw/source/ui/fldui/fldmgr.cxx | 35 ---
sw/source/ui/uiview/viewling.cxx | 4
sw/source/ui/uno/unomailmerge.cxx | 2
sw/source/ui/vba/vbaborders.cxx | 3
tools/source/inet/inetstrm.cxx | 4
tools/source/stream/stream.cxx | 4
unoxml/source/rdf/CURI.cxx | 1
unoxml/source/rdf/librdf_repository.cxx | 2
vcl/source/fontsubset/sft.cxx | 25 --
vcl/source/fontsubset/ttcr.cxx | 61 -----
vcl/source/gdi/pdfwriter_impl.cxx | 1
vcl/unx/kde/UnxFilePicker.cxx | 4
vcl/unx/kde4/KDE4FilePicker.cxx | 4
writerfilter/source/dmapper/ConversionHelper.cxx | 4
xmloff/source/core/xmlexp.cxx | 7
xmloff/source/core/xmlimp.cxx | 9
xmloff/source/core/xmluconv.cxx | 1
xmloff/source/draw/shapeexport2.cxx | 1
xmloff/source/text/XMLIndexBibliographyEntryContext.cxx | 4
xmloff/source/text/XMLIndexObjectSourceContext.cxx | 1
xmloff/source/text/XMLIndexSimpleEntryContext.cxx | 3
xmloff/source/text/XMLIndexTOCSourceContext.cxx | 1
xmloff/source/text/txtfldi.cxx | 11
xmloff/source/text/txtparae.cxx | 8
xmloff/source/text/txtvfldi.cxx | 2
xmloff/source/xforms/xformsexport.cxx | 6
xmlsecurity/source/helper/xsecctl.cxx | 3
148 files changed, 206 insertions(+), 1189 deletions(-)
New commits:
commit d3ca36915e20cf4a0ee724c6ba084fe9653757c2
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Oct 2 16:43:02 2013 +0200
More SAL_WNODEPRECATED_DECLARATIONS_PUSH/POP around std::auto_ptr
...as needed by Clang trunk towards 3.4.
Change-Id: Ibbfe9cb0ec03e0aed939d769feee9e046af4741f
diff --git a/editeng/source/uno/unoedhlp.cxx b/editeng/source/uno/unoedhlp.cxx
index cb6acfd..93217f0 100644
--- a/editeng/source/uno/unoedhlp.cxx
+++ b/editeng/source/uno/unoedhlp.cxx
@@ -56,6 +56,7 @@ sal_Int32 SvxEditSourceHint::GetEndValue() const
//------------------------------------------------------------------------
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<SfxHint> SvxEditSourceHelper::EENotification2Hint( EENotify* aNotify )
{
if( aNotify )
@@ -103,6 +104,7 @@ sal_Int32 SvxEditSourceHint::GetEndValue() const
return ::std::auto_ptr<SfxHint>( new SfxHint() );
}
+SAL_WNODEPRECATED_DECLARATIONS_POP
sal_Bool SvxEditSourceHelper::GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, const EditEngine& rEE, sal_Int32 nPara, sal_uInt16 nIndex )
{
diff --git a/sc/source/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxx
index 2e9b343..271cb7e 100644
--- a/sc/source/ui/unoobj/servuno.cxx
+++ b/sc/source/ui/unoobj/servuno.cxx
@@ -604,7 +604,9 @@ uno::Reference<uno::XInterface> ScServiceProvider::MakeInstance(
ScAddress aAddress;
ScCompiler* pComp = new ScCompiler(pDoc,aAddress);
pComp->SetGrammar( pDoc->GetGrammar() );
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
xRet.set(static_cast<sheet::XFormulaOpCodeMapper*>(new ScFormulaOpCodeMapperObj(::std::auto_ptr<formula::FormulaCompiler> (pComp))));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
break;
}
#ifndef DISABLE_SCRIPTING
diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
index ddb04b1..7e9d9ee 100644
--- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
+++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
@@ -110,8 +110,10 @@ void AccessibleDrawDocumentView::Init (void)
{
pPage->acquire();
pPage->Init();
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
mpChildrenManager->AddAccessibleShape (
std::auto_ptr<AccessibleShape>(pPage));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
pPage->release();
mpChildrenManager->Update ();
}
@@ -304,8 +306,10 @@ void SAL_CALL
{
pPage->acquire();
pPage->Init();
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
mpChildrenManager->AddAccessibleShape (
std::auto_ptr<AccessibleShape>(pPage));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
mpChildrenManager->Update (false);
pPage->release();
}
diff --git a/sd/source/ui/accessibility/AccessibleOutlineView.cxx b/sd/source/ui/accessibility/AccessibleOutlineView.cxx
index 39fc2d8..724c4d9 100644
--- a/sd/source/ui/accessibility/AccessibleOutlineView.cxx
+++ b/sd/source/ui/accessibility/AccessibleOutlineView.cxx
@@ -84,8 +84,10 @@ AccessibleOutlineView::AccessibleOutlineView (
if( pOutlineView && pOutliner )
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
maTextHelper.SetEditSource( ::std::auto_ptr< SvxEditSource >( new AccessibleOutlineEditSource(
*pOutliner, *pView, *pOutlineView, *pSdWindow ) ) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
}
}
}
diff --git a/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx b/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx
index 4681f2e..930cc70 100644
--- a/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx
+++ b/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx
@@ -84,7 +84,9 @@ public:
protected:
friend class ::SdModule;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
friend class ::std::auto_ptr<SdGlobalResourceContainer>;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
class Implementation;
::std::auto_ptr<Implementation> mpImpl;
diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx
index c0c9213..b192ac0 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -1672,7 +1672,9 @@ void SmEditAccessible::ClearWin()
pWin = 0; // implicitly results in AccessibleStateType::DEFUNC set
//! make TextHelper implicitly release C++ references to some core objects
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
pTextHelper->SetEditSource( ::std::auto_ptr<SvxEditSource>(NULL) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
//! make TextHelper release references
//! (e.g. the one set by the 'SetEventSource' call)
pTextHelper->Dispose();
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 5f0eb42..58e03cc 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -185,8 +185,10 @@ SwDoc::SwDoc()
mpAttrPool(new SwAttrPool(this)),
mpMarkManager(new ::sw::mark::MarkManager(*this)),
m_pMetaFieldManager(new ::sw::MetaFieldManager()),
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
m_pUndoManager(new ::sw::UndoManager(
::std::auto_ptr<SwNodes>(new SwNodes(this)), *this, *this, *this)),
+ SAL_WNODEPRECATED_DECLARATIONS_POP
mpDfltFrmFmt( new SwFrmFmt( GetAttrPool(), sFrmFmtStr, 0 ) ),
mpEmptyPageFmt( new SwFrmFmt( GetAttrPool(), sEmptyPageStr, mpDfltFrmFmt ) ),
mpColumnContFmt( new SwFrmFmt( GetAttrPool(), sColumnCntStr, mpDfltFrmFmt ) ),
commit 075d472a9d120431f0b8731e4dcfe3e8b4ded521
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Oct 2 16:41:03 2013 +0200
Use std::auto_ptr::reset where applicable
(avoids warnings about std::auto_ptr ctor being deprecated)
Change-Id: I39d2d155c0bc62ca77a30c02428ea39102213f42
diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx
index a764508..b73b71d 100644
--- a/cui/source/dialogs/passwdomdlg.cxx
+++ b/cui/source/dialogs/passwdomdlg.cxx
@@ -228,7 +228,7 @@ PasswordToOpenModifyDialog::PasswordToOpenModifyDialog(
bool bIsPasswordToModify ) :
SfxModalDialog( pParent, CUI_RES( RID_DLG_PASSWORD_TO_OPEN_MODIFY ) )
{
- m_pImpl = std::auto_ptr< PasswordToOpenModifyDialog_Impl >(
+ m_pImpl.reset(
new PasswordToOpenModifyDialog_Impl( this, nMinPasswdLen, nMaxPasswdLen, bIsPasswordToModify ) );
FreeResource();
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 8adb5c3..0ece675 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -2258,7 +2258,7 @@ short OfaTreeOptionsDialog::Execute()
{
// collect all DictionaryList Events while the dialog is executed
Reference<com::sun::star::linguistic2::XSearchableDictionaryList> xDictionaryList(SvxGetDictionaryList());
- pClamp = ::std::auto_ptr< SvxDicListChgClamp >( new SvxDicListChgClamp( xDictionaryList ) );
+ pClamp.reset( new SvxDicListChgClamp( xDictionaryList ) );
}
short nRet = SfxModalDialog::Execute();
diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.cxx b/dbaccess/source/ui/dlg/UserAdminDlg.cxx
index 95a3b65..c5868d6 100644
--- a/dbaccess/source/ui/dlg/UserAdminDlg.cxx
+++ b/dbaccess/source/ui/dlg/UserAdminDlg.cxx
@@ -60,7 +60,7 @@ DBG_NAME(OUserAdminDlg)
{
DBG_CTOR(OUserAdminDlg,NULL);
- m_pImpl = ::std::auto_ptr<ODbDataSourceAdministrationHelper>(new ODbDataSourceAdministrationHelper(_rxORB,_pParent,this));
+ m_pImpl.reset(new ODbDataSourceAdministrationHelper(_rxORB,_pParent,this));
m_pImpl->setDataSourceOrName(_aDataSourceName);
Reference< XPropertySet > xDatasource = m_pImpl->getCurrentDataSource();
m_pImpl->translateProperties(xDatasource, *_pItems);
diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx
index 50a86b4..84088c7 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.cxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.cxx
@@ -431,7 +431,7 @@ namespace dbaui
const Reference< XComponentContext >& _rxContext, const Any& _aDataSourceName )
:SfxTabDialog(_pParent, ModuleRes(DLG_DATABASE_ADVANCED), _pItems)
{
- m_pImpl = ::std::auto_ptr<ODbDataSourceAdministrationHelper>(new ODbDataSourceAdministrationHelper(_rxContext,_pParent,this));
+ m_pImpl.reset(new ODbDataSourceAdministrationHelper(_rxContext,_pParent,this));
m_pImpl->setDataSourceOrName(_aDataSourceName);
Reference< XPropertySet > xDatasource = m_pImpl->getCurrentDataSource();
m_pImpl->translateProperties(xDatasource, *_pItems);
diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx
index 285feff..609cc9a 100644
--- a/dbaccess/source/ui/dlg/dbadmin.cxx
+++ b/dbaccess/source/ui/dlg/dbadmin.cxx
@@ -60,7 +60,7 @@ ODbAdminDialog::ODbAdminDialog(Window* _pParent
{
DBG_CTOR(ODbAdminDialog,NULL);
- m_pImpl = ::std::auto_ptr<ODbDataSourceAdministrationHelper>(new ODbDataSourceAdministrationHelper(_rxContext,this,this));
+ m_pImpl.reset(new ODbDataSourceAdministrationHelper(_rxContext,this,this));
// add the initial tab page
AddTabPage( m_nMainPageID, OUString( ModuleRes( STR_PAGETITLE_GENERAL ) ), OConnectionTabPage::Create, NULL );
diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx
index 17a495c..ae57cc2 100644
--- a/dbaccess/source/ui/dlg/dbwiz.cxx
+++ b/dbaccess/source/ui/dlg/dbwiz.cxx
@@ -76,7 +76,7 @@ ODbTypeWizDialog::ODbTypeWizDialog(Window* _pParent
,m_bUIEnabled( sal_True )
{
DBG_CTOR(ODbTypeWizDialog,NULL);
- m_pImpl = ::std::auto_ptr<ODbDataSourceAdministrationHelper>(new ODbDataSourceAdministrationHelper(_rxORB,this,this));
+ m_pImpl.reset(new ODbDataSourceAdministrationHelper(_rxORB,this,this));
m_pImpl->setDataSourceOrName(_aDataSourceName);
Reference< XPropertySet > xDatasource = m_pImpl->getCurrentDataSource();
m_pOutSet = new SfxItemSet( *_pItems->GetPool(), _pItems->GetRanges() );
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index f5579f6..db3c14e 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -150,7 +150,7 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(Window* _pParent
FreeResource();
- m_pImpl = ::std::auto_ptr<ODbDataSourceAdministrationHelper>(new ODbDataSourceAdministrationHelper(_rxORB,this,this));
+ m_pImpl.reset(new ODbDataSourceAdministrationHelper(_rxORB,this,this));
m_pImpl->setDataSourceOrName(_aDataSourceName);
Reference< XPropertySet > xDatasource = m_pImpl->getCurrentDataSource();
m_pOutSet = new SfxItemSet( *_pItems->GetPool(), _pItems->GetRanges() );
diff --git a/forms/source/xforms/submission.cxx b/forms/source/xforms/submission.cxx
index 873b6c1..1559bb8 100644
--- a/forms/source/xforms/submission.cxx
+++ b/forms/source/xforms/submission.cxx
@@ -312,14 +312,11 @@ bool Submission::doSubmit( const Reference< XInteractionHandler >& xHandler )
// submit result; set encoding, etc.
auto_ptr<CSubmission> xSubmission;
if (aMethod.equalsIgnoreAsciiCase("PUT"))
- xSubmission = auto_ptr<CSubmission>(
- new CSubmissionPut( getAction(), aFragment));
+ xSubmission.reset(new CSubmissionPut( getAction(), aFragment));
else if (aMethod.equalsIgnoreAsciiCase("post"))
- xSubmission = auto_ptr<CSubmission>(
- new CSubmissionPost( getAction(), aFragment));
+ xSubmission.reset(new CSubmissionPost( getAction(), aFragment));
else if (aMethod.equalsIgnoreAsciiCase("get"))
- xSubmission = auto_ptr<CSubmission>(
- new CSubmissionGet( getAction(), aFragment));
+ xSubmission.reset(new CSubmissionGet( getAction(), aFragment));
else
{
OSL_FAIL("Unsupported xforms submission method");
diff --git a/linguistic/source/convdic.cxx b/linguistic/source/convdic.cxx
index 539f884..66c657e 100644
--- a/linguistic/source/convdic.cxx
+++ b/linguistic/source/convdic.cxx
@@ -176,9 +176,9 @@ ConvDic::ConvDic(
aMainURL = rMainURL;
if (bBiDirectional)
- pFromRight = std::auto_ptr< ConvMap >( new ConvMap );
+ pFromRight.reset( new ConvMap );
if (nLang == LANGUAGE_CHINESE_SIMPLIFIED || nLang == LANGUAGE_CHINESE_TRADITIONAL)
- pConvPropType = std::auto_ptr< PropTypeMap >( new PropTypeMap );
+ pConvPropType.reset( new PropTypeMap );
nMaxLeftCharCount = nMaxRightCharCount = 0;
bMaxCharCountIsValid = sal_True;
diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx
index ffcfbc2..f489319 100644
--- a/reportdesign/source/ui/report/ReportSection.cxx
+++ b/reportdesign/source/ui/report/ReportSection.cxx
@@ -121,7 +121,7 @@ OReportSection::~OReportSection()
if ( m_pReportListener.is() )
m_pReportListener->dispose();
- m_pFunc = ::std::auto_ptr<DlgEdFunc>();
+ m_pFunc.reset();
{
::std::auto_ptr<OSectionView> aTemp( m_pView);
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index cd09ffb..1086bd1 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -237,7 +237,7 @@ ScDocument::ScDocument( ScDocumentMode eMode,
pDBCollection = new ScDBCollection(this);
pSelectionAttr = NULL;
pChartCollection = new ScChartCollection;
- apTemporaryChartLock = std::auto_ptr< ScTemporaryChartLock >( new ScTemporaryChartLock(this) );
+ apTemporaryChartLock.reset( new ScTemporaryChartLock(this) );
xColNameRanges = new ScRangePairList;
xRowNameRanges = new ScRangePairList;
ImplCreateOptions();
diff --git a/sc/source/core/tool/chartlock.cxx b/sc/source/core/tool/chartlock.cxx
index dfc2b5c..b63d3b9 100644
--- a/sc/source/core/tool/chartlock.cxx
+++ b/sc/source/core/tool/chartlock.cxx
@@ -158,7 +158,7 @@ ScTemporaryChartLock::~ScTemporaryChartLock()
void ScTemporaryChartLock::StartOrContinueLocking()
{
if(!mapScChartLockGuard.get())
- mapScChartLockGuard = std::auto_ptr< ScChartLockGuard >( new ScChartLockGuard(mpDoc) );
+ mapScChartLockGuard.reset( new ScChartLockGuard(mpDoc) );
maTimer.Start();
}
diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index 2d23bbd..e252589 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -173,10 +173,8 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh)
, mpMasterPageListWatcher(0)
, mbUseEmbedFonts(false)
{
- mpDrawPageListWatcher = ::std::auto_ptr<ImpDrawPageListWatcher>(
- new ImpDrawPageListWatcher(*this));
- mpMasterPageListWatcher = ::std::auto_ptr<ImpMasterPageListWatcher>(
- new ImpMasterPageListWatcher(*this));
+ mpDrawPageListWatcher.reset(new ImpDrawPageListWatcher(*this));
+ mpMasterPageListWatcher.reset(new ImpMasterPageListWatcher(*this));
InitLayoutVector();
InitObjectVector();
diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx
index e8130f4..fba3f5c 100644
--- a/sfx2/source/dialog/securitypage.cxx
+++ b/sfx2/source/dialog/securitypage.cxx
@@ -430,7 +430,7 @@ SfxTabPage* SfxSecurityPage::Create( Window * pParent, const SfxItemSet & rItemS
SfxSecurityPage::SfxSecurityPage( Window* pParent, const SfxItemSet& rItemSet )
: SfxTabPage(pParent, "SecurityInfoPage", "sfx/ui/securityinfopage.ui", rItemSet)
{
- m_pImpl = std::auto_ptr< SfxSecurityPage_Impl >(new SfxSecurityPage_Impl( *this, rItemSet ));
+ m_pImpl.reset(new SfxSecurityPage_Impl( *this, rItemSet ));
}
diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx
index bf3d6ad..2da034a 100644
--- a/slideshow/source/engine/shapes/viewmediashape.cxx
+++ b/slideshow/source/engine/shapes/viewmediashape.cxx
@@ -141,7 +141,7 @@ namespace slideshow
mxPlayerWindow.clear();
}
- mpMediaWindow = ::std::auto_ptr< SystemChildWindow >();
+ mpMediaWindow.reset();
// shutdown player
if( mxPlayer.is() )
@@ -433,7 +433,7 @@ namespace slideshow
rRangePix.getMaxX() - rRangePix.getMinX(),
rRangePix.getMaxY() - rRangePix.getMinY() );
- mpMediaWindow = ::std::auto_ptr< SystemChildWindow >( new
+ mpMediaWindow.reset( new
SystemChildWindow( pWindow, WB_CLIPCHILDREN ) );
mpMediaWindow->SetBackground( Color( COL_BLACK ) );
mpMediaWindow->SetPosSizePixel( Point( aAWTRect.X, aAWTRect.Y ),
diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx
index 252eed7..5189812 100644
--- a/svtools/source/brwbox/editbrowsebox.cxx
+++ b/svtools/source/brwbox/editbrowsebox.cxx
@@ -120,7 +120,7 @@ namespace svt
DBG_NAME(EditBrowseBox);
void EditBrowseBox::impl_construct()
{
- m_aImpl = ::std::auto_ptr<EditBrowseBoxImpl>(new EditBrowseBoxImpl());
+ m_aImpl.reset(new EditBrowseBoxImpl());
SetCompoundControl(sal_True);
SetGridLineColor( Color( COL_LIGHTGRAY ) );
diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx
index 59cfec6..0d8295b 100644
--- a/sw/source/core/undo/rolbck.cxx
+++ b/sw/source/core/undo/rolbck.cxx
@@ -611,12 +611,12 @@ void SwHistoryBookmark::SetInDoc( SwDoc* pDoc, bool )
// #111660# don't crash when nNode1 doesn't point to content node.
if(pCntntNd)
- pPam = ::std::auto_ptr<SwPaM>(new SwPaM(*pCntntNd, m_nCntnt));
+ pPam.reset(new SwPaM(*pCntntNd, m_nCntnt));
}
else
{
pMark = pMarkAccess->findMark(m_aName)->get();
- pPam = ::std::auto_ptr<SwPaM>(new SwPaM(pMark->GetMarkPos()));
+ pPam.reset(new SwPaM(pMark->GetMarkPos()));
}
if(m_bSaveOtherPos)
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index ce767ba..95bac6e 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -1154,7 +1154,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
break;
if( 10 == i )
- pWait = ::std::auto_ptr<SwWait>(new SwWait( *pView->GetDocShell(), sal_True ));
+ pWait.reset(new SwWait( *pView->GetDocShell(), sal_True ));
}
rSh.MoveTable( GetfnTableCurr(), GetfnTableStart() );
@@ -1382,7 +1382,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
rSh.SwEditShell::SplitNode();
if( 10 == i )
- pWait = ::std::auto_ptr<SwWait>(new SwWait( *pView->GetDocShell(), sal_True ));
+ pWait.reset(new SwWait( *pView->GetDocShell(), sal_True ));
}
if( !bSetCrsr && pMark != NULL)
diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx
index c67ef7b..44ac4fe 100644
--- a/sw/source/ui/dbui/dbmgr.cxx
+++ b/sw/source/ui/dbui/dbmgr.cxx
@@ -1001,7 +1001,7 @@ sal_Bool SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell,
aEntry.removeSegment();
sPath = aEntry.GetMainURL( INetURLObject::NO_DECODE );
OUString sExt(comphelper::string::stripStart(pStoreToFilter->GetDefaultExtension(), '*'));
- aTempFile = std::auto_ptr< utl::TempFile >(
+ aTempFile.reset(
new utl::TempFile(sLeading,&sExt,&sPath ));
if( bAsSingleFile )
aTempFile->EnableKillingFile();
diff --git a/sw/source/ui/uiview/viewling.cxx b/sw/source/ui/uiview/viewling.cxx
index 1d2d9fa..fc1bf1c 100644
--- a/sw/source/ui/uiview/viewling.cxx
+++ b/sw/source/ui/uiview/viewling.cxx
@@ -689,10 +689,10 @@ sal_Bool SwView::ExecSpellPopup(const Point& rPt)
{
sal_Int32 nPos = aPoint.nContent.GetIndex();
(void) nPos;
- pPopup = std::auto_ptr< SwSpellPopup >(new SwSpellPopup( m_pWrtShell, aGrammarCheckRes, nErrorInResult, aSuggestions, aParaText ));
+ pPopup.reset(new SwSpellPopup( m_pWrtShell, aGrammarCheckRes, nErrorInResult, aSuggestions, aParaText ));
}
else
- pPopup = std::auto_ptr< SwSpellPopup >(new SwSpellPopup( m_pWrtShell, xAlt, aParaText ));
+ pPopup.reset(new SwSpellPopup( m_pWrtShell, xAlt, aParaText ));
ui::ContextMenuExecuteEvent aEvent;
const Point aPixPos = GetEditWin().LogicToPixel( rPt );
diff --git a/sw/source/ui/uno/unomailmerge.cxx b/sw/source/ui/uno/unomailmerge.cxx
index 86d20e2..e601f24 100644
--- a/sw/source/ui/uno/unomailmerge.cxx
+++ b/sw/source/ui/uno/unomailmerge.cxx
@@ -739,7 +739,7 @@ uno::Any SAL_CALL SwXMailMerge::execute(
aMergeDesc.bSendAsAttachment = bSendAsAttachment;
aMergeDesc.bCreateSingleFile = sal_False;
- pMMConfigItem = std::auto_ptr< SwMailMergeConfigItem >(new SwMailMergeConfigItem);
+ pMMConfigItem.reset(new SwMailMergeConfigItem);
aMergeDesc.pMailMergeConfigItem = pMMConfigItem.get();
aMergeDesc.xSmtpServer = SwMailMergeHelper::ConnectToSmtpServer(
*pMMConfigItem,
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index eac056cf..e8aa453 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -361,19 +361,19 @@ BoundFrameSets::BoundFrameSets(const Reference<XInterface> xModel)
const Reference<XTextEmbeddedObjectsSupplier> xEOS(xModel, UNO_QUERY);
const Reference<XDrawPageSupplier> xDPS(xModel, UNO_QUERY);
if(xTFS.is())
- m_pTexts = auto_ptr<BoundFrames>(new BoundFrames(
+ m_pTexts.reset(new BoundFrames(
Reference<XEnumerationAccess>(xTFS->getTextFrames(), UNO_QUERY),
&lcl_TextContentsUnfiltered));
if(xGOS.is())
- m_pGraphics = auto_ptr<BoundFrames>(new BoundFrames(
+ m_pGraphics.reset(new BoundFrames(
Reference<XEnumerationAccess>(xGOS->getGraphicObjects(), UNO_QUERY),
&lcl_TextContentsUnfiltered));
if(xEOS.is())
- m_pEmbeddeds = auto_ptr<BoundFrames>(new BoundFrames(
+ m_pEmbeddeds.reset(new BoundFrames(
Reference<XEnumerationAccess>(xEOS->getEmbeddedObjects(), UNO_QUERY),
&lcl_TextContentsUnfiltered));
if(xDPS.is())
- m_pShapes = auto_ptr<BoundFrames>(new BoundFrames(
+ m_pShapes.reset(new BoundFrames(
Reference<XEnumerationAccess>(xDPS->getDrawPage(), UNO_QUERY),
&lcl_ShapeFilter));
};
commit 3e1bd6961d3317fe2bef4a34a41f5d1fc2a33008
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Oct 2 16:36:28 2013 +0200
Replace deprecated std::auto_ptr with boost::scoped_ptr
Change-Id: Id76eb2af60d7b87228f479aeb4a40373c648ae11
diff --git a/include/sfx2/itemconnect.hxx b/include/sfx2/itemconnect.hxx
index 95a545e..3f73a90 100644
--- a/include/sfx2/itemconnect.hxx
+++ b/include/sfx2/itemconnect.hxx
@@ -24,6 +24,8 @@
#include "sfx2/dllapi.h"
#include <memory>
+
+#include <boost/scoped_ptr.hpp>
#include <sfx2/itemwrapper.hxx>
#include <sfx2/controlwrapper.hxx>
@@ -518,7 +520,7 @@ bool ItemControlConnection< ItemWrpT, ControlWrpT >::FillItemSet(
if( !pOldItem || !(maItemWrp.GetItemValue( *pOldItem ) == aNewValue) )
{
sal_uInt16 nWhich = ItemWrapperHelper::GetWhichId( rDestSet, maItemWrp.GetSlotId() );
- std::auto_ptr< ItemType > xItem(
+ boost::scoped_ptr< ItemType > xItem(
static_cast< ItemType* >( maItemWrp.GetDefaultItem( rDestSet ).Clone() ) );
xItem->SetWhich( nWhich );
maItemWrp.SetItemValue( *xItem, aNewValue );
commit 0718498999a22c07e595217f0b370b9c39dcc1f2
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Oct 2 16:34:37 2013 +0200
Replace deprecated std::auto_ptr with boost::scoped_ptr
Change-Id: Ic55d1a8b14ec0355a6289007d954e89cd41c7486
diff --git a/connectivity/source/drivers/jdbc/JConnection.cxx b/connectivity/source/drivers/jdbc/JConnection.cxx
index db94bbe..4c7a3a9 100644
--- a/connectivity/source/drivers/jdbc/JConnection.cxx
+++ b/connectivity/source/drivers/jdbc/JConnection.cxx
@@ -17,7 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include "sal/config.h"
+#include "boost/scoped_ptr.hpp"
#include "java/sql/Connection.hxx"
#include "java/lang/Class.hxx"
#include "java/tools.hxx"
@@ -45,7 +47,6 @@
#include <unotools/confignode.hxx>
#include <list>
-#include <memory>
using namespace connectivity;
using namespace connectivity::jdbc;
@@ -690,11 +691,11 @@ void java_sql_Connection::loadDriverFromProperties( const OUString& _sDriverClas
{
m_aLogger.log( LogLevel::INFO, STR_LOG_LOADING_DRIVER, _sDriverClass );
// the driver manager holds the class of the driver for later use
- ::std::auto_ptr< java_lang_Class > pDrvClass;
+ boost::scoped_ptr< java_lang_Class > pDrvClass;
if ( _sDriverClassPath.isEmpty() )
{
// if forName didn't find the class it will throw an exception
- pDrvClass = ::std::auto_ptr< java_lang_Class >(java_lang_Class::forName(_sDriverClass));
+ pDrvClass.reset(java_lang_Class::forName(_sDriverClass));
}
else
{
commit c6e2b7ac2ac02b714e4c3d894d68bc3e5f20f685
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Oct 2 16:31:16 2013 +0200
Tweak a second time the code to silence a warning
...to avoid "functions that differ only in their return type cannot be
overloaded" errors (as emitted by Clang trunk towards 3.4).
Change-Id: I89909e88211a0da06fd0197abeb05f44c18b1032
diff --git a/boost/boost_1_44_0-gcc4.8.patch b/boost/boost_1_44_0-gcc4.8.patch
index 3039a31..700e2ff 100644
--- a/boost/boost_1_44_0-gcc4.8.patch
+++ b/boost/boost_1_44_0-gcc4.8.patch
@@ -164,8 +164,8 @@
&::boost::concepts::requirement_<ModelFnPtr>::failed> \
- BOOST_PP_CAT(boost_concept_check,__LINE__)
+ BOOST_PP_CAT(boost_concept_check,__LINE__); \
-+ BOOST_PP_CAT(boost_concept_check,__LINE__) BOOST_PP_CAT(boost_concept_check_dummy,__LINE__)(...)
-+ // silence -Werror=unused-local-typedefs (GCC 4.8) (and resulting Clang -Werror,-Wvexing-parse)
++ void BOOST_PP_CAT(boost_concept_check_dummy,__LINE__)(BOOST_PP_CAT(boost_concept_check,__LINE__) *)
++ // silence -Werror=unused-local-typedefs (GCC 4.8)
}}
commit abb6ab4145b49d1320637792ec8f858b7c9156fe
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Oct 2 16:27:26 2013 +0200
Fix warnings in sqlflex.l, sqlbison.y
Change-Id: I6c6b9452014940e09f8f4b7466c5a5f562c9fff5
diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y
index fb38373..de0d7b7 100644
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -4348,10 +4348,6 @@ IMPLEMENT_CONSTASCII_STRING(KEY_STR_COLLECT, "COLLECT");
IMPLEMENT_CONSTASCII_STRING(KEY_STR_FUSION, "FUSION");
IMPLEMENT_CONSTASCII_STRING(KEY_STR_INTERSECTION, "INTERSECTION");
-IMPLEMENT_CONSTASCII_STRING(FIELD_STR_NULLDATE, "NullDate");
-
-IMPLEMENT_CONSTASCII_STRING(STR_SQL_TOKEN, "SQL_TOKEN_");
-
//==========================================================================
//= OParseContext
//==========================================================================
@@ -4675,7 +4671,7 @@ OSQLParseNode* OSQLParser::parseTree(::rtl::OUString& rErrorMessage,
// to work around a bug in MKS YACC return the member m_pParseTree
// instead of Sdbyyval.pParseNode
- SAL_WARN_IF(!m_pParseTree, "connectivity",
+ SAL_WARN_IF(!m_pParseTree, "connectivity.parse",
"OSQLParser: Parser did not create ParseTree");
return m_pParseTree;
}
diff --git a/connectivity/source/parse/sqlflex.l b/connectivity/source/parse/sqlflex.l
index 0aad9d2..d8e659c 100644
--- a/connectivity/source/parse/sqlflex.l
+++ b/connectivity/source/parse/sqlflex.l
@@ -708,7 +708,7 @@ OSQLScanner::~OSQLScanner()
{
}
//------------------------------------------------------------------------------
-void OSQLScanner::SQLyyerror(sal_Char *fmt)
+void OSQLScanner::SQLyyerror(char const *fmt)
{
if(IN_SQLyyerror)
diff --git a/include/connectivity/sqlscan.hxx b/include/connectivity/sqlscan.hxx
index dd0aa46..cf881c5 100644
--- a/include/connectivity/sqlscan.hxx
+++ b/include/connectivity/sqlscan.hxx
@@ -54,7 +54,7 @@ namespace connectivity
{ }
virtual sal_Int32 SQLyygetc(void);
- virtual void SQLyyerror(char *fmt);
+ virtual void SQLyyerror(char const *fmt);
virtual void output(sal_Int32) { OSL_FAIL("Internal error in sdblex.l: output not possible"); }
virtual void ECHO(void) { OSL_FAIL("Internal error in sdblex.l: ECHO not possible"); }
virtual IParseContext::InternationalKeyCode getInternationalTokenID(const char* sToken) const;
commit 205641f3757acd8d0372b1353eff7fd8de999364
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Oct 2 14:05:50 2013 +0200
-Werror,-Wunused-const-variable
Change-Id: Iab2e11d03cdf5de9571b27fc96267c1b600dd0a5
diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx
index bee9548..cf3686e 100644
--- a/reportdesign/source/ui/dlg/AddField.cxx
+++ b/reportdesign/source/ui/dlg/AddField.cxx
@@ -48,8 +48,6 @@ namespace rptui
const long STD_WIN_SIZE_X = 180;
const long STD_WIN_SIZE_Y = 320;
-const long LISTBOX_BORDER = 2;
-
using namespace ::com::sun::star;
using namespace sdbc;
using namespace sdb;
commit cf22cb1298937f1e2878319024afbaab129a432b
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Oct 2 14:03:43 2013 +0200
-Werror,-Wunused-const-variable
Change-Id: I5126e80f2876da5275061d2c824a0d3213d76b9a
diff --git a/sw/source/ui/vba/vbaborders.cxx b/sw/source/ui/vba/vbaborders.cxx
index dff8194..1e2d8ff 100644
--- a/sw/source/ui/vba/vbaborders.cxx
+++ b/sw/source/ui/vba/vbaborders.cxx
@@ -42,9 +42,6 @@ static const sal_Int16 supportedIndexTable[] = { word::WdBorderType::wdBorderBot
const static OUString sTableBorder("TableBorder");
// Equiv widths in in 1/100 mm
-const static sal_Int32 OOLineThin = 35;
-const static sal_Int32 OOLineMedium = 88;
-const static sal_Int32 OOLineThick = 141;
const static sal_Int32 OOLineHairline = 2;
class SwVbaBorder : public SwVbaBorder_Base
commit 4c0454eadbcf2a47010faa7777d2e52f67e44891
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Oct 2 14:01:42 2013 +0200
-Werror,-Wunused-const-variable
Change-Id: Ic37531aa2fe9b0098cf8b027275d314607208154
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 78abe81..2302087 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -50,14 +50,6 @@ T* lcl_popOrZero( ::std::stack<T*> & rStack )
}
}
-static const sal_Unicode aDelimiterTable[] =
-{
- ' ', '\t', '\n', '\r', '+', '-', '*', '/', '=', '#',
- '%', '\\', '"', '~', '`', '>', '<', '&', '|', '(',
- ')', '{', '}', '[', ']', '^', '_',
- '\0' // end of list symbol
-};
-
SmToken::SmToken() :
eType (TUNKNOWN),
cMathChar ('\0')
@@ -325,6 +317,14 @@ const SmTokenTableEntry * SmParser::GetTokenTableEntry( const OUString &rName )
#if OSL_DEBUG_LEVEL > 1
+static const sal_Unicode aDelimiterTable[] =
+{
+ ' ', '\t', '\n', '\r', '+', '-', '*', '/', '=', '#',
+ '%', '\\', '"', '~', '`', '>', '<', '&', '|', '(',
+ ')', '{', '}', '[', ']', '^', '_',
+ '\0' // end of list symbol
+};
+
bool SmParser::IsDelimiter( const OUString &rTxt, sal_Int32 nPos )
// returns 'true' iff cChar is '\0' or a delimeter
{
commit 2f3e2137dd3240a63d89278771c06fda6a7b1f47
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Oct 2 12:53:39 2013 +0200
-Werror,-Wunused-const-variable
Change-Id: Ib4c7980df8296abffab7f2ac9b823408fc05b9be
diff --git a/sc/source/filter/oox/worksheetsettings.cxx b/sc/source/filter/oox/worksheetsettings.cxx
index 96ca193..ee32cf2 100644
--- a/sc/source/filter/oox/worksheetsettings.cxx
+++ b/sc/source/filter/oox/worksheetsettings.cxx
@@ -45,32 +45,11 @@ using ::oox::core::CodecHelper;
namespace {
const sal_uInt8 BIFF12_SHEETPR_FILTERMODE = 0x01;
-const sal_uInt8 BIFF12_SHEETPR_EVAL_CF = 0x02;
-const sal_uInt32 BIFF_SHEETEXT_NOTABCOLOR = 0x7F;
-
-const sal_uInt16 BIFF_SHEETPR_DIALOGSHEET = 0x0010;
const sal_uInt16 BIFF_SHEETPR_APPLYSTYLES = 0x0020;
const sal_uInt16 BIFF_SHEETPR_SYMBOLSBELOW = 0x0040;
const sal_uInt16 BIFF_SHEETPR_SYMBOLSRIGHT = 0x0080;
const sal_uInt16 BIFF_SHEETPR_FITTOPAGES = 0x0100;
-const sal_uInt16 BIFF_SHEETPR_SKIPEXT = 0x0200; // BIFF3-BIFF4
-
-const sal_uInt32 BIFF_SHEETPROT_OBJECTS = 0x00000001;
-const sal_uInt32 BIFF_SHEETPROT_SCENARIOS = 0x00000002;
-const sal_uInt32 BIFF_SHEETPROT_FORMAT_CELLS = 0x00000004;
-const sal_uInt32 BIFF_SHEETPROT_FORMAT_COLUMNS = 0x00000008;
-const sal_uInt32 BIFF_SHEETPROT_FORMAT_ROWS = 0x00000010;
-const sal_uInt32 BIFF_SHEETPROT_INSERT_COLUMNS = 0x00000020;
-const sal_uInt32 BIFF_SHEETPROT_INSERT_ROWS = 0x00000040;
-const sal_uInt32 BIFF_SHEETPROT_INSERT_HLINKS = 0x00000080;
-const sal_uInt32 BIFF_SHEETPROT_DELETE_COLUMNS = 0x00000100;
-const sal_uInt32 BIFF_SHEETPROT_DELETE_ROWS = 0x00000200;
-const sal_uInt32 BIFF_SHEETPROT_SELECT_LOCKED = 0x00000400;
-const sal_uInt32 BIFF_SHEETPROT_SORT = 0x00000800;
-const sal_uInt32 BIFF_SHEETPROT_AUTOFILTER = 0x00001000;
-const sal_uInt32 BIFF_SHEETPROT_PIVOTTABLES = 0x00002000;
-const sal_uInt32 BIFF_SHEETPROT_SELECT_UNLOCKED = 0x00004000;
} // namespace
commit 26ebd3db21e65e76e0aa1f34ef4a6ff6935fc6a9
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Oct 2 12:52:17 2013 +0200
-Werror,-Wunused-const-variable
Change-Id: I721dce7a588cc1a1176c65f83eef6d98492e7515
diff --git a/sc/source/filter/oox/worksheetfragment.cxx b/sc/source/filter/oox/worksheetfragment.cxx
index 93cacd7..a13e52d 100644
--- a/sc/source/filter/oox/worksheetfragment.cxx
+++ b/sc/source/filter/oox/worksheetfragment.cxx
@@ -66,8 +66,6 @@ const sal_uInt16 BIFF_DEFROW_CUSTOMHEIGHT = 0x0001;
const sal_uInt16 BIFF_DEFROW_HIDDEN = 0x0002;
const sal_uInt16 BIFF_DEFROW_THICKTOP = 0x0004;
const sal_uInt16 BIFF_DEFROW_THICKBOTTOM = 0x0008;
-const sal_uInt16 BIFF2_DEFROW_DEFHEIGHT = 0x8000;
-const sal_uInt16 BIFF2_DEFROW_MASK = 0x7FFF;
const sal_uInt32 BIFF_DATAVAL_STRINGLIST = 0x00000080;
const sal_uInt32 BIFF_DATAVAL_ALLOWBLANK = 0x00000100;
@@ -75,12 +73,8 @@ const sal_uInt32 BIFF_DATAVAL_NODROPDOWN = 0x00000200;
const sal_uInt32 BIFF_DATAVAL_SHOWINPUT = 0x00040000;
const sal_uInt32 BIFF_DATAVAL_SHOWERROR = 0x00080000;
-const sal_uInt32 BIFF_SHRFEATHEAD_SHEETPROT = 2;
-
-const sal_Int32 BIFF12_OLEOBJECT_CONTENT = 1;
const sal_Int32 BIFF12_OLEOBJECT_ICON = 4;
const sal_Int32 BIFF12_OLEOBJECT_ALWAYS = 1;
-const sal_Int32 BIFF12_OLEOBJECT_ONCALL = 3;
const sal_uInt16 BIFF12_OLEOBJECT_LINKED = 0x0001;
const sal_uInt16 BIFF12_OLEOBJECT_AUTOLOAD = 0x0002;
commit 24748fef344d91f5d3272cc739d0cb4008710074
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Oct 2 12:51:09 2013 +0200
-Werror,-Wunused-const-variable
Change-Id: I42e279065803501e93834012be45a39a66a318e7
diff --git a/sc/source/filter/oox/viewsettings.cxx b/sc/source/filter/oox/viewsettings.cxx
index bb4a0c0..7df163d 100644
--- a/sc/source/filter/oox/viewsettings.cxx
+++ b/sc/source/filter/oox/viewsettings.cxx
@@ -59,22 +59,18 @@ namespace {
const sal_Int32 OOX_BOOKVIEW_TABBARRATIO_DEF = 600; /// Default tabbar ratio.
const sal_Int32 OOX_SHEETVIEW_NORMALZOOM_DEF = 100; /// Default zoom for normal view.
const sal_Int32 OOX_SHEETVIEW_SHEETLAYZOOM_DEF = 60; /// Default zoom for pagebreak preview.
-const sal_Int32 OOX_SHEETVIEW_PAGELAYZOOM_DEF = 100; /// Default zoom for page layout view.
const sal_uInt8 BIFF12_PANE_FROZEN = 0x01;
const sal_uInt8 BIFF12_PANE_FROZENNOSPLIT = 0x02;
-const sal_uInt16 BIFF12_SHEETVIEW_WINPROTECTED = 0x0001;
const sal_uInt16 BIFF12_SHEETVIEW_SHOWFORMULAS = 0x0002;
const sal_uInt16 BIFF12_SHEETVIEW_SHOWGRID = 0x0004;
const sal_uInt16 BIFF12_SHEETVIEW_SHOWHEADINGS = 0x0008;
const sal_uInt16 BIFF12_SHEETVIEW_SHOWZEROS = 0x0010;
const sal_uInt16 BIFF12_SHEETVIEW_RIGHTTOLEFT = 0x0020;
const sal_uInt16 BIFF12_SHEETVIEW_SELECTED = 0x0040;
-const sal_uInt16 BIFF12_SHEETVIEW_SHOWRULER = 0x0080;
const sal_uInt16 BIFF12_SHEETVIEW_SHOWOUTLINE = 0x0100;
const sal_uInt16 BIFF12_SHEETVIEW_DEFGRIDCOLOR = 0x0200;
-const sal_uInt16 BIFF12_SHEETVIEW_SHOWWHITESPACE = 0x0400;
const sal_uInt16 BIFF12_CHARTSHEETVIEW_SELECTED = 0x0001;
const sal_uInt16 BIFF12_CHARTSHEETVIEW_ZOOMTOFIT = 0x0002;
@@ -84,31 +80,6 @@ const sal_uInt8 BIFF12_WBVIEW_MINIMIZED = 0x02;
const sal_uInt8 BIFF12_WBVIEW_SHOWHORSCROLL = 0x08;
const sal_uInt8 BIFF12_WBVIEW_SHOWVERSCROLL = 0x10;
const sal_uInt8 BIFF12_WBVIEW_SHOWTABBAR = 0x20;
-const sal_uInt8 BIFF12_WBVIEW_AUTOFILTERGROUP = 0x40;
-
-const sal_uInt8 BIFF_PANE_BOTTOMRIGHT = 0; /// Bottom-right pane.
-const sal_uInt8 BIFF_PANE_TOPRIGHT = 1; /// Right, or top-right pane.
-const sal_uInt8 BIFF_PANE_BOTTOMLEFT = 2; /// Bottom, or bottom-left pane.
-const sal_uInt8 BIFF_PANE_TOPLEFT = 3; /// Single, top, left, or top-left pane.
-
-const sal_uInt16 BIFF_WINDOW1_HIDDEN = 0x0001;
-const sal_uInt16 BIFF_WINDOW1_MINIMIZED = 0x0002;
-const sal_uInt16 BIFF_WINDOW1_SHOWHORSCROLL = 0x0008;
-const sal_uInt16 BIFF_WINDOW1_SHOWVERSCROLL = 0x0010;
-const sal_uInt16 BIFF_WINDOW1_SHOWTABBAR = 0x0020;
-
-const sal_uInt16 BIFF_WINDOW2_SHOWFORMULAS = 0x0001;
-const sal_uInt16 BIFF_WINDOW2_SHOWGRID = 0x0002;
-const sal_uInt16 BIFF_WINDOW2_SHOWHEADINGS = 0x0004;
-const sal_uInt16 BIFF_WINDOW2_FROZEN = 0x0008;
-const sal_uInt16 BIFF_WINDOW2_SHOWZEROS = 0x0010;
-const sal_uInt16 BIFF_WINDOW2_DEFGRIDCOLOR = 0x0020;
-const sal_uInt16 BIFF_WINDOW2_RIGHTTOLEFT = 0x0040;
-const sal_uInt16 BIFF_WINDOW2_SHOWOUTLINE = 0x0080;
-const sal_uInt16 BIFF_WINDOW2_FROZENNOSPLIT = 0x0100;
-const sal_uInt16 BIFF_WINDOW2_SELECTED = 0x0200;
-const sal_uInt16 BIFF_WINDOW2_DISPLAYED = 0x0400;
-const sal_uInt16 BIFF_WINDOW2_PAGEBREAKMODE = 0x0800;
// Attention: view settings in Calc do not use com.sun.star.view.DocumentZoomType!
const sal_Int16 API_ZOOMTYPE_PERCENT = 0; /// Zoom value in percent.
commit e6bf0a617348a671107000b640864b3e27b98404
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Oct 2 12:48:48 2013 +0200
-Werror,-Wunused-const-variable
Change-Id: I12075a8cb78c5ddfe05def1fb158797a73abc87f
diff --git a/sc/source/filter/oox/themebuffer.cxx b/sc/source/filter/oox/themebuffer.cxx
index aec2474..1970ce8 100644
--- a/sc/source/filter/oox/themebuffer.cxx
+++ b/sc/source/filter/oox/themebuffer.cxx
@@ -30,55 +30,6 @@ using ::oox::drawingml::ClrScheme;
// ============================================================================
-namespace {
-
-/** Specifies default theme fonts for a specific locale. */
-struct BuiltinThemeFont
-{
- const sal_Char* mpcLocale; /// The locale for this font setting.
- const sal_Char* mpcHeadFont; /// Default heading font.
- const sal_Char* mpcBodyFont; /// Default body font.
-};
-
-#define FONT_JA "\357\274\255\357\274\263 \357\274\260\343\202\264\343\202\267\343\203\203\343\202\257"
-#define FONT_KO "\353\247\221\354\235\200 \352\263\240\353\224\225"
-#define FONT_CS "\345\256\213\344\275\223"
-#define FONT_CT "\346\226\260\347\264\260\346\230\216\351\253\224"
-
-static const BuiltinThemeFont spBuiltinThemeFonts[] =
-{ // locale headings font body font
- { "*", "Cambria", "Calibri" }, // Default
- { "ar", "Times New Roman", "Arial" }, // Arabic
- { "bn", "Vrinda", "Vrinda" }, // Bengali
- { "div", "MV Boli", "MV Boli" }, // Divehi
- { "fa", "Times New Roman", "Arial" }, // Farsi
- { "gu", "Shruti", "Shruti" }, // Gujarati
- { "he", "Times New Roman", "Arial" }, // Hebrew
- { "hi", "Mangal", "Mangal" }, // Hindi
- { "ja", FONT_JA, FONT_JA }, // Japanese
- { "kn", "Tunga", "Tunga" }, // Kannada
- { "ko", FONT_KO, FONT_KO }, // Korean
- { "kok", "Mangal", "Mangal" }, // Konkani
- { "ml", "Kartika", "Kartika" }, // Malayalam
- { "mr", "Mangal", "Mangal" }, // Marathi
- { "pa", "Raavi", "Raavi" }, // Punjabi
- { "sa", "Mangal", "Mangal" }, // Sanskrit
- { "syr", "Estrangelo Edessa", "Estrangelo Edessa" }, // Syriac
- { "ta", "Latha", "Latha" }, // Tamil
- { "te", "Gautami", "Gautami" }, // Telugu
- { "th", "Tahoma", "Tahoma" }, // Thai
- { "ur", "Times New Roman", "Arial" }, // Urdu
- { "vi", "Times New Roman", "Arial" }, // Vietnamese
- { "zh", FONT_CS, FONT_CS }, // Chinese, Simplified
- { "zh-HK", FONT_CT, FONT_CT }, // Chinese, Hong Kong
- { "zh-MO", FONT_CT, FONT_CT }, // Chinese, Macau
- { "zh-TW", FONT_CT, FONT_CT } // Chinese, Taiwan
-};
-
-} // namespace
-
-// ----------------------------------------------------------------------------
-
ThemeBuffer::ThemeBuffer( const WorkbookHelper& rHelper ) :
WorkbookHelper( rHelper ),
mxDefFontModel( new FontModel )
commit 2fca868ebfb783b96c6f6e7dc91166cfc30a5f31
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Oct 2 12:45:12 2013 +0200
-Werror,-Wunused-const-variable
Change-Id: Ic6605b1bcf3d768a040449043dc1c20bb1f1fdc4
diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx
index 0280a4a..02ca851 100644
--- a/sc/source/filter/oox/stylesbuffer.cxx
+++ b/sc/source/filter/oox/stylesbuffer.cxx
@@ -117,8 +117,6 @@ const sal_Int32 OOX_XF_TEXTDIR_RTL = 2;
// OOXML cell rotation (also used in BIFF)
const sal_Int32 OOX_XF_ROTATION_NONE = 0;
-const sal_Int32 OOX_XF_ROTATION_90CCW = 90;
-const sal_Int32 OOX_XF_ROTATION_90CW = 180;
const sal_Int32 OOX_XF_ROTATION_STACKED = 255;
// OOXML cell indentation
@@ -129,8 +127,6 @@ const sal_Int32 OOX_STYLE_NORMAL = 0; /// Default cell style.
const sal_Int32 OOX_STYLE_ROWLEVEL = 1; /// RowLevel_x cell style.
const sal_Int32 OOX_STYLE_COLLEVEL = 2; /// ColLevel_x cell style.
-const sal_Int32 OOX_STYLE_LEVELCOUNT = 7; /// Number of outline level styles.
-
// BIFF12 constants -----------------------------------------------------------
// BIFF12 color types
@@ -172,11 +168,6 @@ const sal_uInt16 BIFF12_DXF_BORDER_TOP = 6;
const sal_uInt16 BIFF12_DXF_BORDER_BOTTOM = 7;
const sal_uInt16 BIFF12_DXF_BORDER_LEFT = 8;
const sal_uInt16 BIFF12_DXF_BORDER_RIGHT = 9;
-const sal_uInt16 BIFF12_DXF_BORDER_DIAG = 10;
-const sal_uInt16 BIFF12_DXF_BORDER_VERT = 11;
-const sal_uInt16 BIFF12_DXF_BORDER_HOR = 12;
-const sal_uInt16 BIFF12_DXF_BORDER_DIAGUP = 13;
-const sal_uInt16 BIFF12_DXF_BORDER_DIAGDOWN = 14;
const sal_uInt16 BIFF12_DXF_FONT_NAME = 24;
const sal_uInt16 BIFF12_DXF_FONT_WEIGHT = 25;
const sal_uInt16 BIFF12_DXF_FONT_UNDERLINE = 26;
@@ -185,10 +176,6 @@ const sal_uInt16 BIFF12_DXF_FONT_ITALIC = 28;
const sal_uInt16 BIFF12_DXF_FONT_STRIKE = 29;
const sal_uInt16 BIFF12_DXF_FONT_OUTLINE = 30;
const sal_uInt16 BIFF12_DXF_FONT_SHADOW = 31;
-const sal_uInt16 BIFF12_DXF_FONT_CONDENSE = 32;
-const sal_uInt16 BIFF12_DXF_FONT_EXTEND = 33;
-const sal_uInt16 BIFF12_DXF_FONT_CHARSET = 34;
-const sal_uInt16 BIFF12_DXF_FONT_FAMILY = 35;
const sal_uInt16 BIFF12_DXF_FONT_HEIGHT = 36;
const sal_uInt16 BIFF12_DXF_FONT_SCHEME = 37;
const sal_uInt16 BIFF12_DXF_NUMFMT_CODE = 38;
@@ -201,18 +188,11 @@ const sal_uInt16 BIFF12_CELLSTYLE_CUSTOM = 0x0004;
// BIFF constants -------------------------------------------------------------
-// BIFF predefined color indexes
-const sal_uInt16 BIFF2_COLOR_BLACK = 0; /// Black (text) in BIFF2.
-const sal_uInt16 BIFF2_COLOR_WHITE = 1; /// White (background) in BIFF2.
-
// BIFF font flags, also used in BIFF12
-const sal_uInt16 BIFF_FONTFLAG_BOLD = 0x0001;
const sal_uInt16 BIFF_FONTFLAG_ITALIC = 0x0002;
-const sal_uInt16 BIFF_FONTFLAG_UNDERLINE = 0x0004;
const sal_uInt16 BIFF_FONTFLAG_STRIKEOUT = 0x0008;
const sal_uInt16 BIFF_FONTFLAG_OUTLINE = 0x0010;
const sal_uInt16 BIFF_FONTFLAG_SHADOW = 0x0020;
-const sal_uInt16 BIFF_FONTFLAG_CONDENSE = 0x0040;
// BIFF font weight
const sal_uInt16 BIFF_FONTWEIGHT_BOLD = 450;
@@ -224,82 +204,6 @@ const sal_uInt8 BIFF_FONTUNDERL_DOUBLE = 2;
const sal_uInt8 BIFF_FONTUNDERL_SINGLE_ACC = 33;
const sal_uInt8 BIFF_FONTUNDERL_DOUBLE_ACC = 34;
-// BIFF XF flags
-const sal_uInt16 BIFF_XF_LOCKED = 0x0001;
-const sal_uInt16 BIFF_XF_HIDDEN = 0x0002;
-const sal_uInt16 BIFF_XF_STYLE = 0x0004;
-const sal_uInt16 BIFF_XF_STYLEPARENT = 0x0FFF; /// Styles don't have a parent.
-const sal_uInt16 BIFF_XF_WRAPTEXT = 0x0008; /// Automatic line break.
-const sal_uInt16 BIFF_XF_JUSTLASTLINE = 0x0080;
-const sal_uInt16 BIFF_XF_SHRINK = 0x0010; /// Shrink to fit into cell.
-const sal_uInt16 BIFF_XF_MERGE = 0x0020;
-
-// BIFF XF attribute used flags
-const sal_uInt8 BIFF_XF_NUMFMT_USED = 0x01;
-const sal_uInt8 BIFF_XF_FONT_USED = 0x02;
-const sal_uInt8 BIFF_XF_ALIGN_USED = 0x04;
-const sal_uInt8 BIFF_XF_BORDER_USED = 0x08;
-const sal_uInt8 BIFF_XF_AREA_USED = 0x10;
-const sal_uInt8 BIFF_XF_PROT_USED = 0x20;
-
-// BIFF XF text orientation
-const sal_uInt8 BIFF_XF_ORIENT_NONE = 0;
-const sal_uInt8 BIFF_XF_ORIENT_STACKED = 1; /// Stacked top to bottom.
-const sal_uInt8 BIFF_XF_ORIENT_90CCW = 2; /// 90 degr. counterclockwise.
-const sal_uInt8 BIFF_XF_ORIENT_90CW = 3; /// 90 degr. clockwise.
-
-// BIFF XF line styles
-const sal_uInt8 BIFF_LINE_NONE = 0;
-const sal_uInt8 BIFF_LINE_THIN = 1;
-
-// BIFF XF patterns
-const sal_uInt8 BIFF_PATT_NONE = 0;
-const sal_uInt8 BIFF_PATT_125 = 17;
-
-// BIFF2 XF flags
-const sal_uInt8 BIFF2_XF_VALFMT_MASK = 0x3F;
-const sal_uInt8 BIFF2_XF_LOCKED = 0x40;
-const sal_uInt8 BIFF2_XF_HIDDEN = 0x80;
-const sal_uInt8 BIFF2_XF_LEFTLINE = 0x08;
-const sal_uInt8 BIFF2_XF_RIGHTLINE = 0x10;
-const sal_uInt8 BIFF2_XF_TOPLINE = 0x20;
-const sal_uInt8 BIFF2_XF_BOTTOMLINE = 0x40;
-const sal_uInt8 BIFF2_XF_BACKGROUND = 0x80;
-
-// BIFF8 diagonal borders
-const sal_uInt32 BIFF_XF_DIAG_TLBR = 0x40000000; /// Top-left to bottom-right.
-const sal_uInt32 BIFF_XF_DIAG_BLTR = 0x80000000; /// Bottom-left to top-right.
-
-// BIFF STYLE flags
-const sal_uInt16 BIFF_STYLE_BUILTIN = 0x8000;
-const sal_uInt16 BIFF_STYLE_XFMASK = 0x0FFF;
-
-// BIFF STYLEEXT flags
-const sal_uInt8 BIFF_STYLEEXT_BUILTIN = 0x01;
-const sal_uInt8 BIFF_STYLEEXT_HIDDEN = 0x02;
-const sal_uInt8 BIFF_STYLEEXT_CUSTOM = 0x04;
-
-// BIFF conditional formatting
-const sal_uInt32 BIFF_CFRULE_BORDER_LEFT = 0x00000400;
-const sal_uInt32 BIFF_CFRULE_BORDER_RIGHT = 0x00000800;
-const sal_uInt32 BIFF_CFRULE_BORDER_TOP = 0x00001000;
-const sal_uInt32 BIFF_CFRULE_BORDER_BOTTOM = 0x00002000;
-const sal_uInt32 BIFF_CFRULE_FILL_PATTERN = 0x00010000;
-const sal_uInt32 BIFF_CFRULE_FILL_PATTCOLOR = 0x00020000;
-const sal_uInt32 BIFF_CFRULE_FILL_FILLCOLOR = 0x00040000;
-const sal_uInt32 BIFF_CFRULE_FONTBLOCK = 0x04000000;
-const sal_uInt32 BIFF_CFRULE_ALIGNBLOCK = 0x08000000;
-const sal_uInt32 BIFF_CFRULE_BORDERBLOCK = 0x10000000;
-const sal_uInt32 BIFF_CFRULE_FILLBLOCK = 0x20000000;
-const sal_uInt32 BIFF_CFRULE_PROTBLOCK = 0x40000000;
-
-const sal_uInt32 BIFF_CFRULE_FONT_STYLE = 0x00000002; /// Font posture or weight modified?
-const sal_uInt32 BIFF_CFRULE_FONT_OUTLINE = 0x00000008; /// Font outline modified?
-const sal_uInt32 BIFF_CFRULE_FONT_SHADOW = 0x00000010; /// Font shadow modified?
-const sal_uInt32 BIFF_CFRULE_FONT_STRIKEOUT = 0x00000080; /// Font cancellation modified?
-const sal_uInt32 BIFF_CFRULE_FONT_UNDERL = 0x00000001; /// Font underline type modified?
-const sal_uInt32 BIFF_CFRULE_FONT_ESCAPEM = 0x00000001; /// Font escapement type modified?
-
// ----------------------------------------------------------------------------
sal_Int32 lclReadRgbColor( BinaryInputStream& rStrm )
@@ -2594,22 +2498,6 @@ void Dxf::writeToPropertySet( PropertySet& rPropSet ) const
namespace {
-const sal_Char* const spcLegacyStyleNamePrefix = "Excel_BuiltIn_";
-const sal_Char* const sppcLegacyStyleNames[] =
-{
- "Normal",
- "RowLevel_", // outline level will be appended
- "ColumnLevel_", // outline level will be appended
- "Comma",
- "Currency",
- "Percent",
- "Comma_0", // new in BIFF4
- "Currency_0",
- "Hyperlink", // new in BIFF8
- "Followed_Hyperlink"
-};
-const sal_Int32 snLegacyStyleNamesCount = static_cast< sal_Int32 >( STATIC_ARRAY_SIZE( sppcLegacyStyleNames ) );
-
const sal_Char* const spcStyleNamePrefix = "Excel Built-in ";
const sal_Char* const sppcStyleNames[] =
{
commit 83c1c72c4ce806b980704f6097d0d1dc8623747a
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Oct 2 12:40:36 2013 +0200
-Werror,-Wunused-const-variable
Change-Id: I4b2ad856f0876a4b88e8196dd32cff13df114bfa
diff --git a/sc/source/filter/oox/sheetdatacontext.cxx b/sc/source/filter/oox/sheetdatacontext.cxx
index 3aaaaac..1a1d574 100644
--- a/sc/source/filter/oox/sheetdatacontext.cxx
+++ b/sc/source/filter/oox/sheetdatacontext.cxx
@@ -64,30 +64,6 @@ const sal_uInt16 BIFF12_ROW_CUSTOMHEIGHT = 0x2000;
const sal_uInt16 BIFF12_ROW_CUSTOMFORMAT = 0x4000;
const sal_uInt8 BIFF12_ROW_SHOWPHONETIC = 0x01;
-const sal_uInt16 BIFF_DATATABLE_ROW = 0x0004;
-const sal_uInt16 BIFF_DATATABLE_2D = 0x0008;
-const sal_uInt16 BIFF_DATATABLE_REF1DEL = 0x0010;
-const sal_uInt16 BIFF_DATATABLE_REF2DEL = 0x0020;
-
-const sal_uInt8 BIFF_FORMULA_RES_STRING = 0; /// Result is a string.
-const sal_uInt8 BIFF_FORMULA_RES_BOOL = 1; /// Result is Boolean value.
-const sal_uInt8 BIFF_FORMULA_RES_ERROR = 2; /// Result is error code.
-const sal_uInt8 BIFF_FORMULA_RES_EMPTY = 3; /// Result is empty cell (BIFF8 only).
-const sal_uInt16 BIFF_FORMULA_SHARED = 0x0008; /// Shared formula cell.
-
-const sal_uInt8 BIFF2_ROW_CUSTOMFORMAT = 0x01;
-const sal_uInt16 BIFF_ROW_DEFAULTHEIGHT = 0x8000;
-const sal_uInt16 BIFF_ROW_HEIGHTMASK = 0x7FFF;
-const sal_uInt32 BIFF_ROW_COLLAPSED = 0x00000010;
-const sal_uInt32 BIFF_ROW_HIDDEN = 0x00000020;
-const sal_uInt32 BIFF_ROW_CUSTOMHEIGHT = 0x00000040;
-const sal_uInt32 BIFF_ROW_CUSTOMFORMAT = 0x00000080;
-const sal_uInt32 BIFF_ROW_THICKTOP = 0x10000000;
-const sal_uInt32 BIFF_ROW_THICKBOTTOM = 0x20000000;
-const sal_uInt32 BIFF_ROW_SHOWPHONETIC = 0x40000000;
-
-const sal_Int32 BIFF2_CELL_USEIXFE = 63;
-
} // namespace
// ============================================================================
commit 56bca204cf62bc7085d4018d9fdd8b40e1bebe6a
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Oct 2 12:37:03 2013 +0200
-Werror,-Wunused-const-variable
Change-Id: I1988333a6376d2cda3e31d09681e1dda6d19251c
diff --git a/sc/source/filter/oox/scenariobuffer.cxx b/sc/source/filter/oox/scenariobuffer.cxx
index ba0766c..cbe5672 100644
--- a/sc/source/filter/oox/scenariobuffer.cxx
+++ b/sc/source/filter/oox/scenariobuffer.cxx
@@ -42,15 +42,6 @@ using namespace ::com::sun::star::sheet;
using namespace ::com::sun::star::table;
using namespace ::com::sun::star::uno;
-
-// ============================================================================
-
-namespace {
-
-const sal_Int32 BIFF_SCENARIO_DELETED = 0x4000;
-
-} // namespace
-
// ============================================================================
ScenarioCellModel::ScenarioCellModel() :
commit 885726bed2fb808e67adb94e745b811715bdf7e4
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Oct 2 12:36:10 2013 +0200
-Werror,-Wunused-const-variable
Change-Id: I22c45ee84521251f294e25556a22f3e0178e9ebf
diff --git a/sc/source/filter/oox/querytablebuffer.cxx b/sc/source/filter/oox/querytablebuffer.cxx
index cf42cc5..bc7f691 100644
--- a/sc/source/filter/oox/querytablebuffer.cxx
+++ b/sc/source/filter/oox/querytablebuffer.cxx
@@ -64,29 +64,6 @@ const sal_uInt32 BIFF12_QUERYTABLE_APPLYBORDER = 0x00020000;
const sal_uInt32 BIFF12_QUERYTABLE_APPLYFILL = 0x00040000;
const sal_uInt32 BIFF12_QUERYTABLE_APPLYPROTECTION = 0x00080000;
-const sal_uInt16 BIFF_QUERYTABLE_HEADERS = 0x0001;
-const sal_uInt16 BIFF_QUERYTABLE_ROWNUMBERS = 0x0002;
-const sal_uInt16 BIFF_QUERYTABLE_DISABLEREFRESH = 0x0004;
-const sal_uInt16 BIFF_QUERYTABLE_BACKGROUND = 0x0008;
-const sal_uInt16 BIFF_QUERYTABLE_FIRSTBACKGROUND = 0x0010;
-const sal_uInt16 BIFF_QUERYTABLE_REFRESHONLOAD = 0x0020;
-const sal_uInt16 BIFF_QUERYTABLE_DELETEUNUSED = 0x0040;
-const sal_uInt16 BIFF_QUERYTABLE_FILLFORMULAS = 0x0080;
-const sal_uInt16 BIFF_QUERYTABLE_ADJUSTCOLWIDTH = 0x0100;
-const sal_uInt16 BIFF_QUERYTABLE_SAVEDATA = 0x0200;
-const sal_uInt16 BIFF_QUERYTABLE_DISABLEEDIT = 0x0400;
-const sal_uInt16 BIFF_QUERYTABLE_OVERWRITEEXISTING = 0x2000;
-
-const sal_uInt16 BIFF_QUERYTABLE_APPLYNUMFMT = 0x0001;
-const sal_uInt16 BIFF_QUERYTABLE_APPLYFONT = 0x0002;
-const sal_uInt16 BIFF_QUERYTABLE_APPLYALIGNMENT = 0x0004;
-const sal_uInt16 BIFF_QUERYTABLE_APPLYBORDER = 0x0008;
-const sal_uInt16 BIFF_QUERYTABLE_APPLYFILL = 0x0010;
-const sal_uInt16 BIFF_QUERYTABLE_APPLYPROTECTION = 0x0020;
-
-const sal_uInt32 BIFF_QTREFRESH_PRESERVEFORMAT = 0x00000001;
-const sal_uInt32 BIFF_QTREFRESH_ADJUSTCOLWIDTH = 0x00000002;
-
// ----------------------------------------------------------------------------
void lclAppendWebQueryTableName( OUStringBuffer& rTables, const OUString& rTableName )
commit 3d04ba9069790b8d9fdf57d1a0150929448d6dc5
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Oct 2 12:31:59 2013 +0200
-Werror,-Wunused-const-variable
Change-Id: Id11612dd29ecc2e0c8f5fc1e5084e1dc37cb91c2
diff --git a/sc/source/filter/oox/pivottablebuffer.cxx b/sc/source/filter/oox/pivottablebuffer.cxx
index eacc235..05519ad 100644
--- a/sc/source/filter/oox/pivottablebuffer.cxx
+++ b/sc/source/filter/oox/pivottablebuffer.cxx
@@ -101,7 +101,6 @@ const sal_uInt16 BIFF12_PTFITEM_HIDDEN = 0x0001;
const sal_uInt16 BIFF12_PTFITEM_HIDEDETAILS = 0x0002;
const sal_uInt8 BIFF12_PTPAGEFIELD_HASNAME = 0x01;
-const sal_uInt8 BIFF12_PTPAGEFIELD_HASOLAPCAPTION = 0x02;
const sal_Int32 BIFF12_PTPAGEFIELD_MULTIITEMS = 0x001000FE;
const sal_uInt16 BIFF12_PTFILTER_HASNAME = 0x0001;
@@ -157,55 +156,6 @@ const sal_uInt32 BIFF12_PTDEF_NOCUSTOMLISTSORT = 0x00004000;
const sal_uInt8 BIFF12_PTDEF_ROWAXIS = 1;
const sal_uInt8 BIFF12_PTDEF_COLAXIS = 2;
-// ----------------------------------------------------------------------------
-
-const sal_uInt16 BIFF_PT_NOSTRING = 0xFFFF;
-
-const sal_uInt16 BIFF_PTFIELD_DATAFIELD = 0x0008;
-const sal_uInt16 BIFF_PTFIELD_DEFAULT = 0x0001;
-const sal_uInt16 BIFF_PTFIELD_SUM = 0x0002;
-const sal_uInt16 BIFF_PTFIELD_COUNTA = 0x0004;
-const sal_uInt16 BIFF_PTFIELD_AVERAGE = 0x0008;
-const sal_uInt16 BIFF_PTFIELD_MAX = 0x0010;
-const sal_uInt16 BIFF_PTFIELD_MIN = 0x0020;
-const sal_uInt16 BIFF_PTFIELD_PRODUCT = 0x0040;
-const sal_uInt16 BIFF_PTFIELD_COUNT = 0x0080;
-const sal_uInt16 BIFF_PTFIELD_STDDEV = 0x0100;
-const sal_uInt16 BIFF_PTFIELD_STDDEVP = 0x0200;
-const sal_uInt16 BIFF_PTFIELD_VAR = 0x0400;
-const sal_uInt16 BIFF_PTFIELD_VARP = 0x0800;
-
-const sal_uInt32 BIFF_PTFIELD2_SHOWALL = 0x00000001;
-const sal_uInt32 BIFF_PTFIELD2_AUTOSORT = 0x00000200;
-const sal_uInt32 BIFF_PTFIELD2_SORTASCENDING = 0x00000400;
-const sal_uInt32 BIFF_PTFIELD2_AUTOSHOW = 0x00000800;
-const sal_uInt32 BIFF_PTFIELD2_AUTOSHOWTOP = 0x00001000;
-const sal_uInt32 BIFF_PTFIELD2_OUTLINE = 0x00200000;
-const sal_uInt32 BIFF_PTFIELD2_INSERTBLANKROW = 0x00400000;
-const sal_uInt32 BIFF_PTFIELD2_SUBTOTALTOP = 0x00800000;
-
-const sal_uInt16 BIFF_PTFITEM_HIDDEN = 0x0001;
-const sal_uInt16 BIFF_PTFITEM_HIDEDETAILS = 0x0002;
-
-const sal_uInt16 BIFF_PTDEF_ROWGRANDTOTALS = 0x0001;
-const sal_uInt16 BIFF_PTDEF_COLGRANDTOTALS = 0x0002;
-
-const sal_uInt8 BIFF_PTDEF_ROWAXIS = 1;
-const sal_uInt8 BIFF_PTDEF_COLAXIS = 2;
-
-const sal_uInt32 BIFF_PTDEF2_PAGEOVERTHENDOWN = 0x00000001;
-const sal_uInt32 BIFF_PTDE2F_ENABLEDRILL = 0x00020000;
-const sal_uInt32 BIFF_PTDEF2_PRESERVEFORMATTING = 0x00080000;
-const sal_uInt32 BIFF_PTDEF2_MERGEITEM = 0x00100000;
-const sal_uInt32 BIFF_PTDEF2_SHOWERROR = 0x00200000;
-const sal_uInt32 BIFF_PTDEF2_SHOWMISSING = 0x00400000;
-const sal_uInt32 BIFF_PTDEF2_SUBTOTALHIDDENITEMS = 0x00800000;
-
-const sal_Int16 BIFF_PTPAGEFIELDS_ALLITEMS = 0x7FFD;
-
-const sal_Int16 BIFF_PTDATAFIELD_PREVIOUS = 0x7FFB;
-const sal_Int16 BIFF_PTDATAFIELD_NEXT = 0x7FFC;
-
} // namespace
// ============================================================================
commit 0198aa317d8f60ffdba315d5f5ad821b381714cc
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Oct 2 12:28:43 2013 +0200
-Werror,-Wunused-const-variable
Change-Id: I441ac5268f94d894a77f346d00a3f66048f96123
diff --git a/sc/source/filter/oox/pivotcachebuffer.cxx b/sc/source/filter/oox/pivotcachebuffer.cxx
index ac836c8..e595bfd 100644
--- a/sc/source/filter/oox/pivotcachebuffer.cxx
+++ b/sc/source/filter/oox/pivotcachebuffer.cxx
@@ -74,7 +74,6 @@ const sal_uInt16 BIFF12_PCDFSITEMS_HASBLANK = 0x0010;
const sal_uInt16 BIFF12_PCDFSITEMS_HASMIXED = 0x0020;
const sal_uInt16 BIFF12_PCDFSITEMS_ISNUMERIC = 0x0040;
const sal_uInt16 BIFF12_PCDFSITEMS_ISINTEGER = 0x0080;
-const sal_uInt16 BIFF12_PCDFSITEMS_HASMINMAX = 0x0100;
const sal_uInt16 BIFF12_PCDFSITEMS_HASLONGTEXT = 0x0200;
const sal_uInt16 BIFF12_PCITEM_ARRAY_DOUBLE = 0x0001;
@@ -105,21 +104,13 @@ const sal_uInt8 BIFF12_PCDWBSOURCE_HASSHEET = 0x02;
// ----------------------------------------------------------------------------
-const sal_uInt16 BIFF_PCDSOURCE_WORKSHEET = 0x0001;
-const sal_uInt16 BIFF_PCDSOURCE_EXTERNAL = 0x0002;
-const sal_uInt16 BIFF_PCDSOURCE_CONSOLIDATION = 0x0004;
-const sal_uInt16 BIFF_PCDSOURCE_SCENARIO = 0x0010;
-
const sal_uInt16 BIFF_PC_NOSTRING = 0xFFFF;
const sal_uInt16 BIFF_PCDFIELD_HASITEMS = 0x0001;
-const sal_uInt16 BIFF_PCDFIELD_HASUNSHAREDITEMS = 0x0002;
-const sal_uInt16 BIFF_PCDFIELD_CALCULATED = 0x0004;
const sal_uInt16 BIFF_PCDFIELD_HASPARENT = 0x0008;
const sal_uInt16 BIFF_PCDFIELD_RANGEGROUP = 0x0010;
const sal_uInt16 BIFF_PCDFIELD_ISNUMERIC = 0x0020;
const sal_uInt16 BIFF_PCDFIELD_HASSEMIMIXED = 0x0080;
-const sal_uInt16 BIFF_PCDFIELD_HASMINMAX = 0x0100;
const sal_uInt16 BIFF_PCDFIELD_HASLONGINDEX = 0x0200;
const sal_uInt16 BIFF_PCDFIELD_HASNONDATE = 0x0400;
const sal_uInt16 BIFF_PCDFIELD_HASDATE = 0x0800;
commit 80d01e30cf4210d05089c3978b16802308c5dcfc
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Oct 2 12:20:33 2013 +0200
-Werror,-Wunused-const-variable
Change-Id: I3df477093b05bd0b7c38866a5a8661717ba0d6c0
diff --git a/sc/source/filter/oox/pagesettings.cxx b/sc/source/filter/oox/pagesettings.cxx
index 9e9f941..8ada668 100644
--- a/sc/source/filter/oox/pagesettings.cxx
+++ b/sc/source/filter/oox/pagesettings.cxx
@@ -70,8 +70,6 @@ const sal_uInt16 BIFF12_PRINTOPT_PRINTGRID = 0x0008;
const sal_uInt16 BIFF12_HEADERFOOTER_DIFFEVEN = 0x0001;
const sal_uInt16 BIFF12_HEADERFOOTER_DIFFFIRST = 0x0002;
-const sal_uInt16 BIFF12_HEADERFOOTER_SCALEDOC = 0x0004;
-const sal_uInt16 BIFF12_HEADERFOOTER_ALIGNMARGIN = 0x0008;
const sal_uInt16 BIFF12_PAGESETUP_INROWS = 0x0001;
const sal_uInt16 BIFF12_PAGESETUP_LANDSCAPE = 0x0002;
@@ -90,16 +88,6 @@ const sal_uInt16 BIFF12_CHARTPAGESETUP_DEFAULTORIENT= 0x0008;
const sal_uInt16 BIFF12_CHARTPAGESETUP_USEFIRSTPAGE = 0x0010;
const sal_uInt16 BIFF12_CHARTPAGESETUP_DRAFTQUALITY = 0x0020;
-const sal_uInt16 BIFF_PAGESETUP_INROWS = 0x0001;
-const sal_uInt16 BIFF_PAGESETUP_PORTRAIT = 0x0002;
-const sal_uInt16 BIFF_PAGESETUP_INVALID = 0x0004;
-const sal_uInt16 BIFF_PAGESETUP_BLACKWHITE = 0x0008;
-const sal_uInt16 BIFF_PAGESETUP_DRAFTQUALITY = 0x0010;
-const sal_uInt16 BIFF_PAGESETUP_PRINTNOTES = 0x0020;
-const sal_uInt16 BIFF_PAGESETUP_DEFAULTORIENT = 0x0040;
-const sal_uInt16 BIFF_PAGESETUP_USEFIRSTPAGE = 0x0080;
-const sal_uInt16 BIFF_PAGESETUP_NOTES_END = 0x0200;
-
} // namespace
// ============================================================================
commit 36d6e2a674395dc3535160484730e8275f775be6
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Oct 2 12:17:48 2013 +0200
-Werror,-Wunused-const-variable
Change-Id: I09e2c5d70e35b007967254cc8c6d76f75f63f1e7
diff --git a/sc/source/filter/oox/drawingmanager.cxx b/sc/source/filter/oox/drawingmanager.cxx
index 6311583..c7ba7b6 100644
--- a/sc/source/filter/oox/drawingmanager.cxx
+++ b/sc/source/filter/oox/drawingmanager.cxx
@@ -51,34 +51,8 @@ namespace {
// OBJ record -----------------------------------------------------------------
-const sal_uInt16 BIFF_OBJTYPE_GROUP = 0;
-const sal_uInt16 BIFF_OBJTYPE_LINE = 1;
-const sal_uInt16 BIFF_OBJTYPE_RECTANGLE = 2;
-const sal_uInt16 BIFF_OBJTYPE_OVAL = 3;
-const sal_uInt16 BIFF_OBJTYPE_ARC = 4;
-const sal_uInt16 BIFF_OBJTYPE_CHART = 5;
-const sal_uInt16 BIFF_OBJTYPE_TEXT = 6;
-const sal_uInt16 BIFF_OBJTYPE_BUTTON = 7;
-const sal_uInt16 BIFF_OBJTYPE_PICTURE = 8;
-const sal_uInt16 BIFF_OBJTYPE_POLYGON = 9; // new in BIFF4
-const sal_uInt16 BIFF_OBJTYPE_CHECKBOX = 11; // new in BIFF5
-const sal_uInt16 BIFF_OBJTYPE_OPTIONBUTTON = 12;
-const sal_uInt16 BIFF_OBJTYPE_EDIT = 13;
-const sal_uInt16 BIFF_OBJTYPE_LABEL = 14;
-const sal_uInt16 BIFF_OBJTYPE_DIALOG = 15;
-const sal_uInt16 BIFF_OBJTYPE_SPIN = 16;
-const sal_uInt16 BIFF_OBJTYPE_SCROLLBAR = 17;
-const sal_uInt16 BIFF_OBJTYPE_LISTBOX = 18;
-const sal_uInt16 BIFF_OBJTYPE_GROUPBOX = 19;
-const sal_uInt16 BIFF_OBJTYPE_DROPDOWN = 20;
-const sal_uInt16 BIFF_OBJTYPE_NOTE = 25; // new in BIFF8
-const sal_uInt16 BIFF_OBJTYPE_DRAWING = 30;
const sal_uInt16 BIFF_OBJTYPE_UNKNOWN = 0xFFFF; // for internal use only
-const sal_uInt16 BIFF_OBJ_HIDDEN = 0x0100;
-const sal_uInt16 BIFF_OBJ_VISIBLE = 0x0200;
-const sal_uInt16 BIFF_OBJ_PRINTABLE = 0x0400;
-
// line formatting ------------------------------------------------------------
const sal_uInt8 BIFF_OBJ_LINE_AUTOCOLOR = 64;
@@ -100,7 +74,6 @@ const sal_uInt8 BIFF_OBJ_LINE_THICK = 3;
const sal_uInt8 BIFF_OBJ_LINE_AUTO = 0x01;
-const sal_uInt8 BIFF_OBJ_ARROW_NONE = 0;
const sal_uInt8 BIFF_OBJ_ARROW_OPEN = 1;
const sal_uInt8 BIFF_OBJ_ARROW_FILLED = 2;
const sal_uInt8 BIFF_OBJ_ARROW_OPENBOTH = 3;
@@ -110,18 +83,6 @@ const sal_uInt8 BIFF_OBJ_ARROW_NARROW = 0;
const sal_uInt8 BIFF_OBJ_ARROW_MEDIUM = 1;
const sal_uInt8 BIFF_OBJ_ARROW_WIDE = 2;
-const sal_uInt8 BIFF_OBJ_LINE_TL = 0;
-const sal_uInt8 BIFF_OBJ_LINE_TR = 1;
-const sal_uInt8 BIFF_OBJ_LINE_BR = 2;
-const sal_uInt8 BIFF_OBJ_LINE_BL = 3;
-
-const sal_uInt8 BIFF_OBJ_ARC_TR = 0;
-const sal_uInt8 BIFF_OBJ_ARC_TL = 1;
-const sal_uInt8 BIFF_OBJ_ARC_BL = 2;
-const sal_uInt8 BIFF_OBJ_ARC_BR = 3;
-
-const sal_uInt16 BIFF_OBJ_POLY_CLOSED = 0x0100;
-
// fill formatting ------------------------------------------------------------
const sal_uInt8 BIFF_OBJ_FILL_AUTOCOLOR = 65;
@@ -131,36 +92,6 @@ const sal_uInt8 BIFF_OBJ_PATT_SOLID = 1;
const sal_uInt8 BIFF_OBJ_FILL_AUTO = 0x01;
-// text formatting ------------------------------------------------------------
-
-const sal_uInt8 BIFF_OBJ_HOR_LEFT = 1;
-const sal_uInt8 BIFF_OBJ_HOR_CENTER = 2;
-const sal_uInt8 BIFF_OBJ_HOR_RIGHT = 3;
-const sal_uInt8 BIFF_OBJ_HOR_JUSTIFY = 4;
-
-const sal_uInt8 BIFF_OBJ_VER_TOP = 1;
-const sal_uInt8 BIFF_OBJ_VER_CENTER = 2;
-const sal_uInt8 BIFF_OBJ_VER_BOTTOM = 3;
-const sal_uInt8 BIFF_OBJ_VER_JUSTIFY = 4;
-
-const sal_uInt16 BIFF_OBJ_ORIENT_NONE = 0;
-const sal_uInt16 BIFF_OBJ_ORIENT_STACKED = 1; /// Stacked top to bottom.
-const sal_uInt16 BIFF_OBJ_ORIENT_90CCW = 2; /// 90 degr. counterclockwise.
-const sal_uInt16 BIFF_OBJ_ORIENT_90CW = 3; /// 90 degr. clockwise.
-
-const sal_uInt16 BIFF_OBJ_TEXT_AUTOSIZE = 0x0080;
-const sal_uInt16 BIFF_OBJ_TEXT_LOCKED = 0x0200;
-
-const sal_Int32 BIFF_OBJ_TEXT_MARGIN = 20000; /// Automatic text margin (EMUs).
-
-// BIFF8 OBJ sub records ------------------------------------------------------
-
-const sal_uInt16 BIFF_OBJCMO_PRINTABLE = 0x0010; /// Object printable.
-const sal_uInt16 BIFF_OBJCMO_AUTOLINE = 0x2000; /// Automatic line formatting.
-const sal_uInt16 BIFF_OBJCMO_AUTOFILL = 0x4000; /// Automatic fill formatting.
-
-// ----------------------------------------------------------------------------
-
} // namespace
// ============================================================================
commit a8ca1a55daf284cdaf7ce4456dfa81c1f719e144
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Oct 2 12:05:03 2013 +0200
-Werror,-Wunused-const-variable
Change-Id: I2c450c7fb9f8d2c85c40f85e0c5694a634953dfd
diff --git a/sc/source/ui/vba/vbainterior.cxx b/sc/source/ui/vba/vbainterior.cxx
index f0c1f09..a3404eb 100644
--- a/sc/source/ui/vba/vbainterior.cxx
+++ b/sc/source/ui/vba/vbainterior.cxx
@@ -42,7 +42,6 @@
#include "document.hxx"
#define COLORMAST 0xFFFFFF
-const sal_uInt16 EXC_COLOR_WINDOWBACK = 65;
typedef std::map< sal_Int32, sal_Int32 > PatternMap;
typedef std::pair< sal_Int32, sal_Int32 > PatternPair;
using namespace ::com::sun::star;
commit d1bb845cbba05d00cf65cb18d297a511b8cc08b0
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Oct 2 10:15:52 2013 +0200
-Werror,-Wunused-const-variable
Change-Id: Ic1fc15e536150184504a7279bc8948051244945d
diff --git a/sc/source/filter/oox/defnamesbuffer.cxx b/sc/source/filter/oox/defnamesbuffer.cxx
index 0cb38f9..3c3dd09 100644
--- a/sc/source/filter/oox/defnamesbuffer.cxx
+++ b/sc/source/filter/oox/defnamesbuffer.cxx
@@ -56,22 +56,7 @@ const sal_uInt32 BIFF12_DEFNAME_HIDDEN = 0x00000001;
const sal_uInt32 BIFF12_DEFNAME_FUNC = 0x00000002;
const sal_uInt32 BIFF12_DEFNAME_VBNAME = 0x00000004;
const sal_uInt32 BIFF12_DEFNAME_MACRO = 0x00000008;
-const sal_uInt32 BIFF12_DEFNAME_CALCEXP = 0x00000010;
const sal_uInt32 BIFF12_DEFNAME_BUILTIN = 0x00000020;
-const sal_uInt32 BIFF12_DEFNAME_PUBLISHED = 0x00008000;
-const sal_uInt32 BIFF12_DEFNAME_WBPARAM = 0x00010000;
-
-const sal_uInt16 BIFF_DEFNAME_HIDDEN = 0x0001;
-const sal_uInt16 BIFF_DEFNAME_FUNC = 0x0002;
-const sal_uInt16 BIFF_DEFNAME_VBNAME = 0x0004;
-const sal_uInt16 BIFF_DEFNAME_MACRO = 0x0008;
-const sal_uInt16 BIFF_DEFNAME_CALCEXP = 0x0010;
-const sal_uInt16 BIFF_DEFNAME_BUILTIN = 0x0020;
-const sal_uInt16 BIFF_DEFNAME_BIG = 0x1000;
-
-const sal_uInt8 BIFF2_DEFNAME_FUNC = 0x02; /// BIFF2 function/command flag.
-
-const sal_uInt16 BIFF_DEFNAME_GLOBAL = 0; /// 0 = Globally defined name.
const sal_uInt16 BIFF_REFFLAG_COL1REL = 0x0001;
const sal_uInt16 BIFF_REFFLAG_ROW1REL = 0x0002;
@@ -80,7 +65,6 @@ const sal_uInt16 BIFF_REFFLAG_ROW2REL = 0x0008;
// ----------------------------------------------------------------------------
-const sal_Char* const spcLegacyPrefix = "Excel_BuiltIn_";
const sal_Char* const spcOoxPrefix = "_xlnm.";
const sal_Char* const sppcBaseNames[] =
@@ -101,13 +85,6 @@ const sal_Char* const sppcBaseNames[] =
"_FilterDatabase"
};
-/** Localized names for _xlnm._FilterDatabase as used in BIFF5. */
-const sal_Char* const sppcFilterDbNames[] =
-{
- "_FilterDatabase", // English
- "_FilterDatenbank" // German
-};
-
OUString lclGetBaseName( sal_Unicode cBuiltinId )
{
OSL_ENSURE( cBuiltinId < STATIC_ARRAY_SIZE( sppcBaseNames ), "lclGetBaseName - unsupported built-in identifier" );
commit 290f0c278a69592ec1e14afaea140152d1f1fa07
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Oct 2 10:13:15 2013 +0200
-Werror,-Wunused-const-variable
Change-Id: Idf6c16b837add81a2d4948a7a0e6a68ce79a0f16
diff --git a/sc/source/filter/oox/commentsbuffer.cxx b/sc/source/filter/oox/commentsbuffer.cxx
index f9d39e9..cee629d 100644
--- a/sc/source/filter/oox/commentsbuffer.cxx
+++ b/sc/source/filter/oox/commentsbuffer.cxx
@@ -85,14 +85,6 @@ static sal_Int32 lcl_ToVertAlign( sal_Int32 nAlign )
// ============================================================================
-namespace {
-
-const sal_uInt16 BIFF_NOTE_VISIBLE = 0x0002;
-
-} // namespace
-
-// ============================================================================
-
CommentModel::CommentModel() :
mnAuthorId( -1 ),
mnObjId( BIFF_OBJ_INVALID_ID ),
commit a63562fcef5edb23c8d76d225892e24e7488130e
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Oct 2 10:12:38 2013 +0200
-Werror,-Wunused-const-variable
Change-Id: I360580a72137273425be2bcbd383f4e398013fee
diff --git a/sc/source/filter/oox/externallinkbuffer.cxx b/sc/source/filter/oox/externallinkbuffer.cxx
index bdfb6af..c454ae89 100644
--- a/sc/source/filter/oox/externallinkbuffer.cxx
+++ b/sc/source/filter/oox/externallinkbuffer.cxx
@@ -66,13 +66,6 @@ const sal_uInt16 BIFF12_EXTNAME_STDDOCNAME = 0x0008;
const sal_uInt16 BIFF12_EXTNAME_OLEOBJECT = 0x0010;
const sal_uInt16 BIFF12_EXTNAME_ICONIFIED = 0x0020;
-const sal_uInt16 BIFF_EXTNAME_BUILTIN = 0x0001;
-const sal_uInt16 BIFF_EXTNAME_AUTOMATIC = 0x0002;
-const sal_uInt16 BIFF_EXTNAME_PREFERPIC = 0x0004;
-const sal_uInt16 BIFF_EXTNAME_STDDOCNAME = 0x0008;
-const sal_uInt16 BIFF_EXTNAME_OLEOBJECT = 0x0010;
-const sal_uInt16 BIFF_EXTNAME_ICONIFIED = 0x8000;
-
} // namespace
// ============================================================================
commit b1d6c93f8902c077a2a47c1d03dcb0266abdec2f
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Oct 2 10:01:26 2013 +0200
-Werror,-Wunused-const-variable
Change-Id: Ie889b0504e3fe36fd82a461daa818419359787a1
diff --git a/sc/source/filter/oox/connectionsbuffer.cxx b/sc/source/filter/oox/connectionsbuffer.cxx
index f605a59..9f81107 100644
--- a/sc/source/filter/oox/connectionsbuffer.cxx
+++ b/sc/source/filter/oox/connectionsbuffer.cxx
@@ -35,11 +35,8 @@ using namespace ::com::sun::star::uno;
namespace {
const sal_Int32 BIFF12_RECONNECT_AS_REQUIRED = 1;
-const sal_Int32 BIFF12_RECONNECT_ALWAYS = 2;
-const sal_Int32 BIFF12_RECONNECT_NEVER = 3;
const sal_uInt8 BIFF12_CONNECTION_SAVEPASSWORD_ON = 1;
-const sal_uInt8 BIFF12_CONNECTION_SAVEPASSWORD_OFF = 2;
const sal_uInt16 BIFF12_CONNECTION_KEEPALIVE = 0x0001;
const sal_uInt16 BIFF12_CONNECTION_NEW = 0x0002;
@@ -69,30 +66,6 @@ const sal_uInt8 BIFF12_WEBPR_HAS_POSTMETHOD = 0x01;
const sal_uInt8 BIFF12_WEBPR_HAS_EDITPAGE = 0x02;
const sal_uInt8 BIFF12_WEBPR_HAS_URL = 0x04;
-const sal_uInt16 BIFF_DBQUERY_ODBC = 0x0008;
-const sal_uInt16 BIFF_DBQUERY_SQLQUERY = 0x0010;
-const sal_uInt16 BIFF_DBQUERY_SERVERBASEDSQL = 0x0020;
-const sal_uInt16 BIFF_DBQUERY_HTML = 0x0040;
-const sal_uInt16 BIFF_DBQUERY_SAVEPASSWORD = 0x0080;
-const sal_uInt16 BIFF_DBQUERY_HTMLTABLES = 0x0100;
-
-const sal_uInt16 BIFF_QTSETTINGS_KEEPALIVE = 0x0001;
-const sal_uInt16 BIFF_QTSETTINGS_NEW = 0x0002;
-const sal_uInt16 BIFF_QTSETTINGS_SOURCEDATA = 0x0004;
-const sal_uInt16 BIFF_QTSETTINGS_WEBBASEDPROV = 0x0008;
-const sal_uInt16 BIFF_QTSETTINGS_REINITLIST = 0x0010;
-const sal_uInt16 BIFF_QTSETTINGS_XML = 0x0080;
-
-const sal_uInt16 BIFF_QTSETTINGS_PARSEPRE = 0x0001;
-const sal_uInt16 BIFF_QTSETTINGS_CONSECUTIVE = 0x0002;
-const sal_uInt16 BIFF_QTSETTINGS_FIRSTROW = 0x0004;
-const sal_uInt16 BIFF_QTSETTINGS_XL97CREATED = 0x0008;
-const sal_uInt16 BIFF_QTSETTINGS_TEXTDATES = 0x0010;
-const sal_uInt16 BIFF_QTSETTINGS_XL2000REFRESHED = 0x0020;
-
-const sal_uInt16 BIFF_QTSETTINGS_TEXTQUERY = 0x0001;
-const sal_uInt16 BIFF_QTSETTINGS_TABLENAMES = 0x0002;
-
} // namespace
// ============================================================================
commit f8b7c8b1d53af7f9b4b7cf1ab6edcfdb5cea94f8
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Oct 2 10:00:15 2013 +0200
-Werror,-Wunused-const-variable
Change-Id: I183ee16a9bd4cde8405cd39e9fe4610c09e759f5
diff --git a/sc/source/filter/oox/excelhandlers.cxx b/sc/source/filter/oox/excelhandlers.cxx
index 66219b5..406781b 100644
--- a/sc/source/filter/oox/excelhandlers.cxx
+++ b/sc/source/filter/oox/excelhandlers.cxx
@@ -65,19 +65,6 @@ BiffWorksheetContextBase::BiffWorksheetContextBase( const WorksheetHelper& rHelp
// ============================================================================
-namespace {
-
-const sal_uInt16 BIFF_BOF_GLOBALS = 0x0005; /// BIFF5-BIFF8 workbook globals.
-const sal_uInt16 BIFF_BOF_MODULE = 0x0006; /// BIFF5-BIFF8 Visual Basic module.
-const sal_uInt16 BIFF_BOF_SHEET = 0x0010; /// BIFF2-BIFF8 worksheet/dialog sheet.
-const sal_uInt16 BIFF_BOF_CHART = 0x0020; /// BIFF2-BIFF8 chart sheet.
-const sal_uInt16 BIFF_BOF_MACRO = 0x0040; /// BIFF4-BIFF8 macro sheet.
-const sal_uInt16 BIFF_BOF_WORKSPACE = 0x0100; /// BIFF3-BIFF8 workspace.
-
-} // namespace
-
-// ----------------------------------------------------------------------------
-
BiffFragmentHandler::BiffFragmentHandler( const FilterBase& rFilter, const OUString& rStrmName )
{
// do not automatically close the root stream (indicated by empty stream name)
commit b117d38f18265cf402e0bf6799f6b328eac7cb13
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Oct 1 19:53:50 2013 +0200
-Werror,-Wunused-const-variable
Change-Id: I003f3e82a0391b4f2d283a23b038e6bd4078b336
diff --git a/sc/source/filter/oox/addressconverter.cxx b/sc/source/filter/oox/addressconverter.cxx
index 958acb6..6c71b49 100644
--- a/sc/source/filter/oox/addressconverter.cxx
+++ b/sc/source/filter/oox/addressconverter.cxx
@@ -70,20 +70,6 @@ const sal_Int32 BIFF8_MAXCOL = BIFF5_MAXCOL;
const sal_Int32 BIFF8_MAXROW = 65535;
const sal_Int16 BIFF8_MAXTAB = BIFF5_MAXTAB;
-const sal_Unicode BIFF_URL_DRIVE = '\x01'; /// DOS drive letter or UNC path.
-const sal_Unicode BIFF_URL_ROOT = '\x02'; /// Root directory of current drive.
-const sal_Unicode BIFF_URL_SUBDIR = '\x03'; /// Subdirectory delimiter.
-const sal_Unicode BIFF_URL_PARENT = '\x04'; /// Parent directory.
-const sal_Unicode BIFF_URL_RAW = '\x05'; /// Unencoded URL.
-const sal_Unicode BIFF_URL_INSTALL = '\x06'; /// Application installation directory.
-const sal_Unicode BIFF_URL_INSTALL2 = '\x07'; /// Alternative application installation directory.
-const sal_Unicode BIFF_URL_LIBRARY = '\x08'; /// Library directory in application installation.
-const sal_Unicode BIFF4_URL_SHEET = '\x09'; /// BIFF4 internal sheet.
-const sal_Unicode BIFF_URL_UNC = '@'; /// UNC path root.
-
-const sal_Unicode BIFF_DCON_ENCODED = '\x01'; /// First character of an encoded path from DCON* records.
-const sal_Unicode BIFF_DCON_INTERN = '\x02'; /// First character of an encoded sheet name from DCON* records.
-
} // namespace
// ============================================================================
commit 71c7f4c34f49b70d6a4691c4be166d5417122c00
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Oct 1 19:52:40 2013 +0200
-Werror,-Wunused-const-variable
Change-Id: Ia44da4452efaf3ba4679e6e6c4acb53ee1ad1fe7
diff --git a/sc/source/filter/oox/autofilterbuffer.cxx b/sc/source/filter/oox/autofilterbuffer.cxx
index 5064440..18ffc08 100644
--- a/sc/source/filter/oox/autofilterbuffer.cxx
+++ b/sc/source/filter/oox/autofilterbuffer.cxx
@@ -52,13 +52,7 @@ const sal_uInt8 BIFF12_TOP10FILTER_PERCENT = 0x02;
const sal_uInt16 BIFF12_FILTERCOLUMN_HIDDENBUTTON = 0x0001;
const sal_uInt16 BIFF12_FILTERCOLUMN_SHOWBUTTON = 0x0002;
-const sal_uInt16 BIFF_FILTERCOLUMN_OR = 0x0001;
-const sal_uInt16 BIFF_FILTERCOLUMN_TOP10FILTER = 0x0010;
-const sal_uInt16 BIFF_FILTERCOLUMN_TOP = 0x0020;
-const sal_uInt16 BIFF_FILTERCOLUMN_PERCENT = 0x0040;
-
const sal_uInt8 BIFF_FILTER_DATATYPE_NONE = 0;
-const sal_uInt8 BIFF_FILTER_DATATYPE_RK = 2;
const sal_uInt8 BIFF_FILTER_DATATYPE_DOUBLE = 4;
const sal_uInt8 BIFF_FILTER_DATATYPE_STRING = 6;
const sal_uInt8 BIFF_FILTER_DATATYPE_BOOLEAN = 8;
commit 3c49eac16bc022148b84641507c0dcb54ee5674c
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Oct 1 19:51:51 2013 +0200
-Werror,-Wunused-const-variable
Change-Id: Iaaf1afcdf12da56d7b8a0c3e29bada77c42f9097
diff --git a/sc/source/filter/oox/biffhelper.cxx b/sc/source/filter/oox/biffhelper.cxx
index efc6223..08b274b 100644
--- a/sc/source/filter/oox/biffhelper.cxx
+++ b/sc/source/filter/oox/biffhelper.cxx
@@ -39,16 +39,6 @@ const sal_Int32 BIFF_RK_100FLAG = 0x00000001;
const sal_Int32 BIFF_RK_INTFLAG = 0x00000002;
const sal_Int32 BIFF_RK_VALUEMASK = 0xFFFFFFFC;
-const sal_Int32 BITMAPFILEHEADER_SIZE = 14;
-const sal_Int32 BITMAPCOREHEADER_SIZE = 12;
-const sal_Int32 BITMAPINFOHEADER_SIZE = 40;
-
-const sal_uInt16 BIFF_IMGDATA_WMF = 2;
-const sal_uInt16 BIFF_IMGDATA_DIB = 9;
-const sal_uInt16 BIFF_IMGDATA_NATIVE = 14;
-
-// ----------------------------------------------------------------------------
-
union DecodedDouble
{
double mfValue;
commit 7862239ad7616ef3956e765421a4653c10939129
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Oct 1 19:45:03 2013 +0200
-Werror,-Wunused-const-variable
Change-Id: I8a062156ca81a946040bf0f8db4ec8c32a9963e8
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index ba08713..6744855 100644
--- a/sd/source/ui/view/drviews5.cxx
+++ b/sd/source/ui/view/drviews5.cxx
@@ -65,11 +65,6 @@
namespace sd {
-static const int TABCONTROL_INITIAL_SIZE = 350;
-static const int PAPER_SHADOW_EXT_PIXEL = 2;
-
-
-
void DrawViewShell::ModelHasChanged()
{
Invalidate();
commit 1ac3018454a8439a2173929ed37c10cb361097fd
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Oct 1 19:43:01 2013 +0200
-Werror,-Wunused-const-variable
Change-Id: I5939bcc0fbb12919ff7e4521cd6a71be57635434
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
index c1b1e1a..61617e2 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
@@ -75,19 +75,15 @@ static const sal_uInt32 MOUSE_DRAG (0x00000800);
// key codes.
static const sal_uInt32 OVER_SELECTED_PAGE (0x00010000);
static const sal_uInt32 OVER_UNSELECTED_PAGE (0x00020000);
-static const sal_uInt32 OVER_FADE_INDICATOR (0x00040000);
static const sal_uInt32 SHIFT_MODIFIER (0x00200000);
static const sal_uInt32 CONTROL_MODIFIER (0x00400000);
-static const sal_uInt32 KEY_EVENT (0x10000000);
-
// Some absent events are defined so they can be expressed explicitly.
static const sal_uInt32 NO_MODIFIER (0x00000000);
static const sal_uInt32 NOT_OVER_PAGE (0x00000000);
// Masks
static const sal_uInt32 MODIFIER_MASK (SHIFT_MODIFIER | CONTROL_MODIFIER);
-static const sal_uInt32 BUTTON_MASK (LEFT_BUTTON | RIGHT_BUTTON | MIDDLE_BUTTON);
} // end of anonymous namespace
commit af5847234e9284bcaf475bdcf0990ef950c1767f
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Oct 1 19:41:19 2013 +0200
-Werror,-Wunused-const-variable
Change-Id: I93e9fdf4607bbd964a7557ef0b1788bf901c2c50
diff --git a/sd/source/ui/sidebar/MasterPageContainer.cxx b/sd/source/ui/sidebar/MasterPageContainer.cxx
index 3853771..d6420b9 100644
--- a/sd/source/ui/sidebar/MasterPageContainer.cxx
+++ b/sd/source/ui/sidebar/MasterPageContainer.cxx
@@ -184,10 +184,6 @@ private:
::boost::weak_ptr<MasterPageContainer::Implementation>
MasterPageContainer::Implementation::mpInstance;
-static const MasterPageContainer::Token NIL_TOKEN (-1);
-
-
-
::boost::shared_ptr<MasterPageContainer::Implementation>
MasterPageContainer::Implementation::Instance (void)
commit 827524abfb4b577d08276fde40929a9adfb7ff1a
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Oct 1 19:36:32 2013 +0200
-Werror,-Wunused-const-variable
Change-Id: Id530355d5f014bb02507b3c493b74a98ee3409ee
diff --git a/sd/source/ui/dlg/TemplateScanner.cxx b/sd/source/ui/dlg/TemplateScanner.cxx
index 028beb12..93a057c 100644
--- a/sd/source/ui/dlg/TemplateScanner.cxx
+++ b/sd/source/ui/dlg/TemplateScanner.cxx
@@ -49,8 +49,6 @@ const char TARGET_DIR_URL[] = "TargetDirURL";
const char DESCRIPTION[] = "TypeDescription";
const char TARGET_URL[] = "TargetURL";
-const char DOCTEMPLATES[] = "com.sun.star.frame.DocumentTemplates";
-
// These strings are used to find impress templates in the tree of
// template files. Should probably be determined dynamically.
const char IMPRESS_BIN_TEMPLATE[] = "application/vnd.stardivision.impress";
commit 9e76691bc20cd5bf32fe76f5c2eacaa5b5db6d88
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Oct 1 19:30:43 2013 +0200
-Werror,-Wunused-const-variable
Change-Id: Ie9611fc32c046059425a4b14988d69574869c3c5
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index 5a3fc8d..50aba6f 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -94,7 +94,6 @@ extern void TransformOOo2xDocument( SdDrawDocument* pDocument );
XML_STRING( sXML_metaStreamName, "meta.xml");
XML_STRING( sXML_styleStreamName, "styles.xml" );
XML_STRING( sXML_contentStreamName, "content.xml" );
-XML_STRING( sXML_oldContentStreamName, "Content.xml" );
XML_STRING( sXML_settingsStreamName, "settings.xml" );
XML_STRING( sXML_export_impress_oasis_service, "com.sun.star.comp.Impress.XMLOasisExporter" );
commit 6e41ee0927ab44d653466aab51851e92b428f8c0
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Oct 1 19:24:28 2013 +0200
-Werror,-Wunneeded-internal-declaration
Change-Id: Id6d82b258695262accb3f17ba8406e272772d7ce
diff --git a/sw/source/ui/fldui/fldmgr.cxx b/sw/source/ui/fldui/fldmgr.cxx
index d63a35c..e7b7c44 100644
--- a/sw/source/ui/fldui/fldmgr.cxx
+++ b/sw/source/ui/fldui/fldmgr.cxx
@@ -133,32 +133,9 @@ enum
GRP_WEB_VAR_END = GRP_WEB_VAR_BEGIN + 1
};
-/*--------------------------------------------------------------------
- Description: formats in the correct order
- --------------------------------------------------------------------*/
-
-static const sal_uInt16 aGetFmt[] =
-{
-// at first the order has to match the ResourceIds for FMT_GETVAR_???
- 0
-};
-
-static const sal_uInt16 aUsrFmt[] =
-{
-// at first the order has to match the ResourceIds for FMT_SETVAR_???
- 0,
- nsSwExtendedSubType::SUB_CMD
-};
-
-static const sal_uInt16 aDBFmt[] =
-{
-// at first the order has to match the ResourceIds for FMT_DBFLD_???
- nsSwExtendedSubType::SUB_OWN_FMT
-};
-
-static const sal_uInt16 VF_COUNT = sizeof(aGetFmt) / sizeof(sal_uInt16);
-static const sal_uInt16 VF_USR_COUNT = sizeof(aUsrFmt) / sizeof(sal_uInt16);
-static const sal_uInt16 VF_DB_COUNT = sizeof(aDBFmt) / sizeof(sal_uInt16);
+static const sal_uInt16 VF_COUNT = 1; // { 0 }
+static const sal_uInt16 VF_USR_COUNT = 2; // { 0, nsSwExtendedSubType::SUB_CMD }
+static const sal_uInt16 VF_DB_COUNT = 1; // { nsSwExtendedSubType::SUB_OWN_FMT }
/*--------------------------------------------------------------------
Description: field types and subtypes
commit 11f30299ba20dfd4fb2b27b1006d88653ba835ea
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Oct 1 19:21:39 2013 +0200
-Werror,-Wunused-const-variable
Change-Id: Ie08f03080abc0e2fee650988d1eb73f52e7e053a
diff --git a/sw/source/ui/fldui/fldmgr.cxx b/sw/source/ui/fldui/fldmgr.cxx
index 7c55bd2..d63a35c 100644
--- a/sw/source/ui/fldui/fldmgr.cxx
+++ b/sw/source/ui/fldui/fldmgr.cxx
@@ -136,12 +136,6 @@ enum
/*--------------------------------------------------------------------
Description: formats in the correct order
--------------------------------------------------------------------*/
-static const sal_uInt16 aSetFmt[] =
-{
-// at first the order has to match the ResourceIds for FMT_SETVAR_???
- 0,
- 0
-};
static const sal_uInt16 aGetFmt[] =
{
commit 0bc4ea9c319093d73dd7970aba50301828a92d20
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Oct 1 19:19:00 2013 +0200
-Werror,-Wunused-const-variable
Change-Id: I3d7134b56cb9c84b391a38ce8dbe8e2122b81e40
diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx
index 4790c90..1619ee9 100644
--- a/sw/source/filter/html/svxcss1.cxx
+++ b/sw/source/filter/html/svxcss1.cxx
@@ -75,16 +75,6 @@ static CSS1PropertyEnum const aFontSizeTable[] =
{ 0, 0 }
};
-static CSS1PropertyEnum const aFontFamilyTable[] =
-{
- { "serif", FAMILY_ROMAN },
- { "sans-serif", FAMILY_SWISS },
- { "cursive", FAMILY_SCRIPT },
- { "fantasy", FAMILY_DECORATIVE },
- { "monospace", FAMILY_MODERN },
- { 0, 0 }
-};
-
static CSS1PropertyEnum const aFontWeightTable[] =
{
{ "extra-light", WEIGHT_NORMAL }, // WEIGHT_ULTRALIGHT (OBS)
commit 0a76d1a01951265a11654d67d5f499155f2ee607
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Oct 1 19:17:30 2013 +0200
-Werror,-Wunused-const-variable
Change-Id: Icde5d0aa66da7ddc6c8d6853372a8a6ddc736971
diff --git a/sw/source/core/unocore/unoevent.cxx b/sw/source/core/unocore/unoevent.cxx
index a9683f7..4719011 100644
--- a/sw/source/core/unocore/unoevent.cxx
+++ b/sw/source/core/unocore/unoevent.cxx
@@ -89,13 +89,6 @@ const struct SvEventDescription aHyperlinkEvents[] =
{ 0, NULL }
};
-const struct SvEventDescription aAutotextEvents[] =
-{
- { SW_EVENT_START_INS_GLOSSARY, "OnInsertStart" },
- { SW_EVENT_END_INS_GLOSSARY, "OnInsertDone" },
- { 0, NULL }
-};
-
const struct SvEventDescription aFrameStyleEvents[] =
{
{ SW_EVENT_OBJECT_SELECT, "OnSelect" },
commit b3ed3c23343058e92f2daa140b0e9ef8a41186d2
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Oct 1 19:12:44 2013 +0200
-Werror,-Wunused-const-variable
Change-Id: Iec4f66232b98b146780703db893e0c3ab1805c08
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index 2ad6483..c5022c9 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -72,7 +72,7 @@ using namespace ::com::sun::star;
// all other chars are changed to the user configuration
const sal_Unicode pBulletChar[6] = { '+', '*', '-', 0x2013, 0x2014, 0 };
-const int cnPosEnDash = 2, cnPosEmDash = 4, cnPosEnd = 5;
+const int cnPosEnDash = 2, cnPosEmDash = 4;
const sal_Unicode cStarSymbolEnDash = 0x2013;
const sal_Unicode cStarSymbolEmDash = 0x2014;
commit 5a9de4f5e30b3cc5316dfea15687ab180fa791d6
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Oct 1 19:11:05 2013 +0200
-Werror,-Wunused-const-variable
Change-Id: Iac8f96b85a707bceaa1f514239e3e44b0692282a
diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx
index b2e6735..9ff849f 100644
--- a/sw/source/core/doc/poolfmt.cxx
+++ b/sw/source/core/doc/poolfmt.cxx
@@ -68,15 +68,11 @@ using namespace ::com::sun::star;
const sal_uInt16 PT_3 = 3 * 20; // 3 pt
const sal_uInt16 PT_6 = 6 * 20; // 6 pt
const sal_uInt16 PT_7 = 7 * 20; // 6 pt
-const sal_uInt16 PT_8 = 8 * 20; // 8 pt
-const sal_uInt16 PT_9 = 9 * 20; // 9 pt
const sal_uInt16 PT_10 = 10 * 20; // 10 pt
-const sal_uInt16 PT_11 = 11 * 20; // 11 pt
const sal_uInt16 PT_12 = 12 * 20; // 12 pt
const sal_uInt16 PT_14 = 14 * 20; // 14 pt
const sal_uInt16 PT_16 = 16 * 20; // 16 pt
const sal_uInt16 PT_18 = 18 * 20; // 18 pt
-const sal_uInt16 PT_22 = 22 * 20; // 22 pt
const sal_uInt16 PT_24 = 24 * 20; // 22 pt
#define HTML_PARSPACE GetMetricVal( CM_05 )
commit ef1e635a414f9793cf4d0e199a972b357b437ab1
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Oct 1 19:10:19 2013 +0200
-Werror,-Wunused-const-variable
Change-Id: Ieece1db92b12bd175c17671a49cc7ddcf2a7befb
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx
index fa5e659..eaf7668 100644
--- a/sw/source/core/doc/tblafmt.cxx
+++ b/sw/source/core/doc/tblafmt.cxx
@@ -59,11 +59,9 @@ const sal_uInt16 AUTOFORMAT_DATA_ID_X = 9502;
const sal_uInt16 AUTOFORMAT_ID_504 = 9801;
const sal_uInt16 AUTOFORMAT_DATA_ID_504 = 9802;
-const sal_uInt16 AUTOFORMAT_ID_552 = 9901;
const sal_uInt16 AUTOFORMAT_DATA_ID_552 = 9902;
// --- from 641 on: CJK and CTL font settings
-const sal_uInt16 AUTOFORMAT_ID_641 = 10001;
const sal_uInt16 AUTOFORMAT_DATA_ID_641 = 10002;
// --- from 680/dr14 on: diagonal frame lines
@@ -72,7 +70,6 @@ const sal_uInt16 AUTOFORMAT_DATA_ID_680DR14 = 10012;
// --- from 680/dr25 on: store strings as UTF-8
const sal_uInt16 AUTOFORMAT_ID_680DR25 = 10021;
-const sal_uInt16 AUTOFORMAT_DATA_ID_680DR25 = 10022;
// --- from DEV300/overline2 on: overline
const sal_uInt16 AUTOFORMAT_ID_300OVRLN = 10031;
commit b2be1d105275bf6150b64679cda765768d850350
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Oct 1 19:07:01 2013 +0200
-Werror,-Wunused-const-variable
Change-Id: I45b9752b295d2dc93b874dc2303320a52bb32a53
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index 24b0830..99a7229 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -134,11 +134,6 @@ double const nRoundVal[] = {
0.5e-15,0.5e-16
};
-double const nKorrVal[] = {
- 9, 9e-1, 9e-2, 9e-3, 9e-4, 9e-5, 9e-6, 9e-7, 9e-8,
- 9e-9, 9e-10, 9e-11, 9e-12, 9e-13, 9e-14
-};
-
// First character may be any alphabetic or underscore.
const sal_Int32 coStartFlags =
i18n::KParseTokens::ANY_LETTER_OR_NUMBER |
commit 03f808c1dadfc8c1ac520caf9b3a4c3747baed2d
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Oct 1 19:06:39 2013 +0200
-Werror,-Wunused-const-variable
Change-Id: I06cc1ed87c491928cd3128dea3adbeb374d8dd49
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index 2e4d424..20b86d6 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -93,7 +93,7 @@ namespace com { namespace sun { namespace star {
const sal_Char sServiceName[] = "com.sun.star.text.AccessibleParagraphView";
const sal_Char sImplementationName[] = "com.sun.star.comp.Writer.SwAccessibleParagraphView";
-const xub_StrLen MAX_DESC_TEXT_LEN = 40;
+
const SwTxtNode* SwAccessibleParagraph::GetTxtNode() const
{
const SwFrm* pFrm = GetFrm();
commit 4763c0acbde9c43d39ed27ff96830a29e1cea5a4
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Oct 1 19:05:10 2013 +0200
-Werror,-Wunused-const-variable
Change-Id: Ic8279d6a52691532b987e7947709bdc14064cc3e
diff --git a/xmlsecurity/source/helper/xsecctl.cxx b/xmlsecurity/source/helper/xsecctl.cxx
index addfc3e..7f00a7f 100644
--- a/xmlsecurity/source/helper/xsecctl.cxx
+++ b/xmlsecurity/source/helper/xsecctl.cxx
@@ -38,9 +38,6 @@ namespace cssxc = com::sun::star::xml::crypto;
namespace cssxs = com::sun::star::xml::sax;
namespace cssxw = com::sun::star::xml::wrapper;
-const sal_Int8 XML_MAXDIGITSCOUNT_TIME = 11;
-const sal_Int8 XML_MAXDIGITSCOUNT_DATETIME = 6;
-
/* bridge component names */
#define XMLSIGNATURE_COMPONENT "com.sun.star.xml.crypto.XMLSignature"
#define XMLDOCUMENTWRAPPER_COMPONENT "com.sun.star.xml.wrapper.XMLDocumentWrapper"
commit 018de58af3d66432311a9c64fafb6689169091f4
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Oct 1 18:31:37 2013 +0200
-Werror,-Wunused-const-variable
Change-Id: Icc5083642021a68566b358bc8bce56e08b71dc20
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
index a1b13d0..a51d8db 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
@@ -50,7 +50,6 @@ const char UNO_BACKGROUNDCOLOR[] = ".uno:BackgroundColor";
const char UNO_SETBORDERSTYLE[] = ".uno:SetBorderStyle";
const char UNO_LINESTYLE[] = ".uno:LineStyle";
const char UNO_FRAMELINECOLOR[] = ".uno:FrameLineColor";
-const char UNO_TOGGLESHEETGRID[] = ".uno:ToggleSheetGrid";
#define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString)))
commit b2a189bdc17e7045fd57ad3d13e68422240ec78a
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Oct 1 18:30:58 2013 +0200
-Werror,-Wunused-const-variable
Change-Id: Ib1b3a251f15ebfe5d72110cd4a070a70591a4f39
diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx
index e1067d8..ca89a95 100644
--- a/sc/source/ui/pagedlg/areasdlg.cxx
+++ b/sc/source/ui/pagedlg/areasdlg.cxx
@@ -43,11 +43,9 @@
// STATIC DATA ---------------------------------------------------------------
// List box positions for print range (PR)
-const sal_uInt16 SC_AREASDLG_PR_NONE = 0;
const sal_uInt16 SC_AREASDLG_PR_ENTIRE = 1;
const sal_uInt16 SC_AREASDLG_PR_USER = 2;
const sal_uInt16 SC_AREASDLG_PR_SELECT = 3;
-const sal_uInt16 SC_AREASDLG_PR_OFFSET = 4;
// List box positions for repeat ranges (RR)
const sal_uInt16 SC_AREASDLG_RR_NONE = 0;
commit 1e4a2246b4d9d0e7c790a821557750ae4bda9698
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Oct 1 18:16:23 2013 +0200
-Werror,-Wunused-const-variable
Change-Id: If30c02760714865b52ba4feb8023bca73ed9402a
diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx
index 4551e80..b938c1d 100644
--- a/sc/source/core/tool/interpr5.cxx
+++ b/sc/source/core/tool/interpr5.cxx
@@ -43,8 +43,6 @@ using namespace formula;
namespace {
-const double fInvEpsilon = 1.0E-7;
-
struct MatrixAdd : public ::std::binary_function<double,double,double>
{
inline double operator() (const double& lhs, const double& rhs) const
@@ -910,6 +908,7 @@ void ScInterpreter::ScMatInv()
*
* The following is #3.
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list