diff options
34 files changed, 35 insertions, 184 deletions
diff --git a/basic/source/comp/exprtree.cxx b/basic/source/comp/exprtree.cxx index 179aaf3b488e..e7a2210ada0c 100644 --- a/basic/source/comp/exprtree.cxx +++ b/basic/source/comp/exprtree.cxx @@ -192,7 +192,7 @@ SbiExprNode* SbiExpression::Term( const KeywordSymbolInfo* pKeywordSymbolInfo ) return pNd; } - SbiToken eTok = (pKeywordSymbolInfo == nullptr) ? pParser->Next() : pKeywordSymbolInfo->m_eTok; + SbiToken eTok = (pKeywordSymbolInfo == nullptr) ? pParser->Next() : SYMBOL; // memorize the parsing's begin pParser->LockColumn(); OUString aSym( (pKeywordSymbolInfo == nullptr) ? pParser->GetSym() : pKeywordSymbolInfo->m_aKeywordSymbol ); diff --git a/basic/source/comp/io.cxx b/basic/source/comp/io.cxx index 6e1c161923e7..5314874f3521 100644 --- a/basic/source/comp/io.cxx +++ b/basic/source/comp/io.cxx @@ -118,7 +118,6 @@ void SbiParser::Line() KeywordSymbolInfo aInfo; aInfo.m_aKeywordSymbol = "line"; aInfo.m_eSbxDataType = GetType(); - aInfo.m_eTok = SYMBOL; Symbol( &aInfo ); } @@ -282,7 +281,6 @@ void SbiParser::Name() KeywordSymbolInfo aInfo; aInfo.m_aKeywordSymbol = "name"; aInfo.m_eSbxDataType = GetType(); - aInfo.m_eTok = SYMBOL; Symbol( &aInfo ); return; diff --git a/basic/source/inc/expr.hxx b/basic/source/inc/expr.hxx index 68a7bf90be0f..a43f4544031f 100644 --- a/basic/source/inc/expr.hxx +++ b/basic/source/inc/expr.hxx @@ -24,6 +24,7 @@ #include "opcodes.hxx" #include "token.hxx" +#include <vector> class SbiExprNode; class SbiExpression; @@ -34,7 +35,6 @@ class SbiSymDef; class SbiProcDef; -#include <vector> typedef ::std::unique_ptr<SbiExprList> SbiExprListPtr; typedef ::std::vector<SbiExprListPtr> SbiExprListVector; @@ -49,7 +49,6 @@ struct KeywordSymbolInfo { OUString m_aKeywordSymbol; SbxDataType m_eSbxDataType; - SbiToken m_eTok; }; enum SbiExprType { // expression types: diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx index 3bf14860bb17..e9ff45b7d053 100644 --- a/editeng/source/outliner/outliner.cxx +++ b/editeng/source/outliner/outliner.cxx @@ -768,7 +768,6 @@ bool Outliner::Expand( Paragraph* pPara ) { UndoActionStart( OLUNDO_EXPAND ); pUndo = new OLUndoExpand( this, OLUNDO_EXPAND ); - pUndo->pParas = nullptr; pUndo->nCount = pParaList->GetAbsPos( pPara ); } pParaList->Expand( pPara ); @@ -796,7 +795,6 @@ bool Outliner::Collapse( Paragraph* pPara ) { UndoActionStart( OLUNDO_COLLAPSE ); pUndo = new OLUndoExpand( this, OLUNDO_COLLAPSE ); - pUndo->pParas = nullptr; pUndo->nCount = pParaList->GetAbsPos( pPara ); } diff --git a/editeng/source/outliner/outlundo.cxx b/editeng/source/outliner/outlundo.cxx index ab55e3a7a5db..6b70e0da7655 100644 --- a/editeng/source/outliner/outlundo.cxx +++ b/editeng/source/outliner/outlundo.cxx @@ -143,13 +143,11 @@ OLUndoExpand::OLUndoExpand(Outliner* pOut, sal_uInt16 _nId ) DBG_ASSERT(pOut,"Undo:No Outliner"); pOutliner = pOut; nCount = 0; - pParas = nullptr; } OLUndoExpand::~OLUndoExpand() { - delete pParas; } @@ -163,25 +161,12 @@ void OLUndoExpand::Restore( bool bUndo ) sal_uInt16 _nId = GetId(); if((_nId == OLUNDO_EXPAND && !bUndo) || (_nId == OLUNDO_COLLAPSE && bUndo)) bExpand = true; - if( !pParas ) - { - pPara = pOutliner->GetParagraph( nCount ); - if( bExpand ) - pOutliner->Expand( pPara ); - else - pOutliner->Collapse( pPara ); - } + + pPara = pOutliner->GetParagraph( nCount ); + if( bExpand ) + pOutliner->Expand( pPara ); else - { - for( sal_Int32 nIdx = 0; nIdx < nCount; nIdx++ ) - { - pPara = pOutliner->GetParagraph( pParas[nIdx] ); - if( bExpand ) - pOutliner->Expand( pPara ); - else - pOutliner->Collapse( pPara ); - } - } + pOutliner->Collapse( pPara ); } void OLUndoExpand::Undo() diff --git a/editeng/source/outliner/outlundo.hxx b/editeng/source/outliner/outlundo.hxx index f1d5fc9696d3..754c79b9ae8f 100644 --- a/editeng/source/outliner/outlundo.hxx +++ b/editeng/source/outliner/outlundo.hxx @@ -113,7 +113,6 @@ public: virtual void Undo() override; virtual void Redo() override; - sal_uInt16* pParas; // 0 == nCount contains paragraph number Outliner* pOutliner; sal_Int32 nCount; }; diff --git a/include/vcl/longcurr.hxx b/include/vcl/longcurr.hxx index 25d6383f8879..8107abe4f93d 100644 --- a/include/vcl/longcurr.hxx +++ b/include/vcl/longcurr.hxx @@ -40,9 +40,8 @@ protected: BigInt mnMax; BigInt mnCorrectedValue; OUString maCurrencySymbol; - sal_uInt16 mnType; sal_uInt16 mnDecimalDigits; - bool mbThousandSep; + bool mbThousandSep; LongCurrencyFormatter(); public: diff --git a/include/vcl/morebtn.hxx b/include/vcl/morebtn.hxx index 36ebd94b5491..a18e341fccd1 100644 --- a/include/vcl/morebtn.hxx +++ b/include/vcl/morebtn.hxx @@ -32,7 +32,6 @@ class VCL_DLLPUBLIC MoreButton : public PushButton { private: ImplMoreButtonData* mpMBData; - MapUnit meUnit; bool mbState; MoreButton( const MoreButton & ) = delete; diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx index 9bf324c0f127..4798bf3ac653 100644 --- a/include/vcl/svapp.hxx +++ b/include/vcl/svapp.hxx @@ -1101,13 +1101,6 @@ public: */ static Help* GetHelp(); - /** Turns on "auto-help" (hover mouse above UI element and a tooltip with an - explanation pops up. - - @see EnableAutoHelpId - */ - static void EnableAutoHelpId(); - ///@} /** @name Dialogs diff --git a/lotuswordpro/source/filter/xfilter/xfimagestyle.cxx b/lotuswordpro/source/filter/xfilter/xfimagestyle.cxx index b9adbb2fe79e..bf1810f00818 100644 --- a/lotuswordpro/source/filter/xfilter/xfimagestyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xfimagestyle.cxx @@ -68,7 +68,6 @@ XFImageStyle::XFImageStyle() , m_fClipRight(0) , m_fClipTop(0) , m_fClipBottom(0) - , m_bHoriFlip(false) {} void XFImageStyle::ToXml(IXFStream *pStrm) @@ -115,9 +114,6 @@ void XFImageStyle::ToXml(IXFStream *pStrm) m_aPad.ToXml(pStrm); //margin: m_aMargins.ToXml(pStrm); - //flip - if( m_bHoriFlip ) - pAttrList->AddAttribute( "style:mirror", "horizontal-on-right-pages" ); if( m_nBrightness ) pAttrList->AddAttribute( "draw:luminance", OUString::number(m_nBrightness) + "%" ); diff --git a/lotuswordpro/source/filter/xfilter/xfimagestyle.hxx b/lotuswordpro/source/filter/xfilter/xfimagestyle.hxx index 02b898f819fb..32615e09bbb0 100644 --- a/lotuswordpro/source/filter/xfilter/xfimagestyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xfimagestyle.hxx @@ -84,7 +84,6 @@ private: double m_fClipRight; double m_fClipTop; double m_fClipBottom; - bool m_bHoriFlip; }; inline void XFImageStyle::SetBrightness(sal_Int32 brightness) diff --git a/mysqlc/source/mysqlc_connection.cxx b/mysqlc/source/mysqlc_connection.cxx index 4afced00bf56..04fff735c627 100644 --- a/mysqlc/source/mysqlc_connection.cxx +++ b/mysqlc/source/mysqlc_connection.cxx @@ -67,7 +67,6 @@ OConnection::OConnection(MysqlCDriver& _rDriver, sql::Driver * _cppDriver) ,m_rDriver(_rDriver) ,cppDriver(_cppDriver) ,m_bClosed(false) - ,m_bUseCatalog(false) { OSL_TRACE("OConnection::OConnection"); m_rDriver.acquire(); diff --git a/mysqlc/source/mysqlc_connection.hxx b/mysqlc/source/mysqlc_connection.hxx index 50ac3c5ac15d..5f1a6a33beed 100644 --- a/mysqlc/source/mysqlc_connection.hxx +++ b/mysqlc/source/mysqlc_connection.hxx @@ -108,7 +108,6 @@ namespace connectivity sql::Driver* cppDriver; bool m_bClosed; - bool m_bUseCatalog; // should we use the catalog on filebased databases public: sal_Int32 getMysqlVersion() @@ -209,8 +208,6 @@ namespace connectivity inline const ConnectionSettings& getConnectionSettings() const { return m_settings; } rtl::OUString transFormPreparedStatement(const rtl::OUString& _sSQL); - // should we use the catalog on filebased databases - inline bool isCatalogUsed() const { return m_bUseCatalog; } inline const MysqlCDriver& getDriver() const { return m_rDriver;} }; /* OConnection */ diff --git a/mysqlc/source/mysqlc_databasemetadata.cxx b/mysqlc/source/mysqlc_databasemetadata.cxx index 85cffebf2050..f3b2029d656f 100644 --- a/mysqlc/source/mysqlc_databasemetadata.cxx +++ b/mysqlc/source/mysqlc_databasemetadata.cxx @@ -83,12 +83,9 @@ ODatabaseMetaData::ODatabaseMetaData(OConnection& _rCon) ,identifier_quote_string_set(false) { OSL_TRACE("ODatabaseMetaData::ODatabaseMetaData"); - if (!m_rConnection.isCatalogUsed()) - { - osl_atomic_increment(&m_refCount); - m_bUseCatalog = !(usesLocalFiles() || usesLocalFilePerTable()); - osl_atomic_decrement(&m_refCount); - } + osl_atomic_increment(&m_refCount); + m_bUseCatalog = !(usesLocalFiles() || usesLocalFilePerTable()); + osl_atomic_decrement(&m_refCount); } ODatabaseMetaData::~ODatabaseMetaData() diff --git a/sc/source/filter/inc/biffinputstream.hxx b/sc/source/filter/inc/biffinputstream.hxx index f5c52f74cfe9..565426a886f7 100644 --- a/sc/source/filter/inc/biffinputstream.hxx +++ b/sc/source/filter/inc/biffinputstream.hxx @@ -218,7 +218,7 @@ private: inline bool isInRecord() const { return mnRecHandle >= 0; } /** Returns true, if the passed ID is real or alternative continuation record ID. */ - bool isContinueId( sal_uInt16 nRecId ) const; + static bool isContinueId( sal_uInt16 nRecId ); /** Goes to start of the next CONTINUE record. @descr Stream must be located at the end of a raw record, and handling of CONTINUE records must be enabled. @@ -236,7 +236,6 @@ private: sal_Int64 mnRecHandle; /// Handle of current record. sal_uInt16 mnRecId; /// Identifier of current record (not the CONTINUE ID). - sal_uInt16 mnAltContId; /// Alternative identifier for content continuation records. sal_Int64 mnCurrRecSize; /// Helper for record size and position. sal_Int64 mnComplRecSize; /// Size of complete record data (with CONTINUEs). diff --git a/sc/source/filter/inc/pivotcachebuffer.hxx b/sc/source/filter/inc/pivotcachebuffer.hxx index a2b45bcf943d..771c53fe57ec 100644 --- a/sc/source/filter/inc/pivotcachebuffer.hxx +++ b/sc/source/filter/inc/pivotcachebuffer.hxx @@ -167,7 +167,6 @@ struct PCSharedItemsModel bool mbIsNumeric; /// True = has numeric item(s), maybe other types except date. bool mbIsInteger; /// True = has numeric item(s) with only integers, maybe other types except date. bool mbHasLongText; /// True = contains strings with >255 characters. - bool mbHasLongIndexes; /// True = indexes to shared items are 16-bit (BIFF only). explicit PCSharedItemsModel(); }; @@ -334,7 +333,6 @@ struct PCDefinitionModel double mfRefreshedDate; /// Date/time of last refresh. sal_Int32 mnRecords; /// Number of data records in the cache. sal_Int32 mnMissItemsLimit; /// Limit for discarding unused items. - sal_uInt16 mnDatabaseFields; /// Number of database (source data) fields (BIFF only). bool mbInvalid; /// True = cache needs refresh. bool mbSaveData; /// True = cached item values are present. bool mbRefreshOnLoad; /// True = try to refresh cache on load. diff --git a/sc/source/filter/oox/biffinputstream.cxx b/sc/source/filter/oox/biffinputstream.cxx index 22e776196900..48e351890d79 100644 --- a/sc/source/filter/oox/biffinputstream.cxx +++ b/sc/source/filter/oox/biffinputstream.cxx @@ -156,7 +156,6 @@ BiffInputStream::BiffInputStream( BinaryInputStream& rInStream ) : maRecBuffer( rInStream ), mnRecHandle( -1 ), mnRecId( BIFF_ID_UNKNOWN ), - mnAltContId( BIFF_ID_UNKNOWN ), mnCurrRecSize( 0 ), mnComplRecSize( 0 ), mbHasComplRec( false ) @@ -319,7 +318,6 @@ void BiffInputStream::setupRecord() // initialize class members mnRecHandle = maRecBuffer.getRecHeaderPos(); mnRecId = maRecBuffer.getRecId(); - mnAltContId = BIFF_ID_UNKNOWN; mnCurrRecSize = mnComplRecSize = maRecBuffer.getRecSize(); mbHasComplRec = false; mbEof = !isInRecord(); @@ -347,9 +345,9 @@ void BiffInputStream::rewindToRecord( sal_Int64 nRecHandle ) } } -bool BiffInputStream::isContinueId( sal_uInt16 nRecId ) const +bool BiffInputStream::isContinueId( sal_uInt16 nRecId ) { - return (nRecId == BIFF_ID_CONT) || (nRecId == mnAltContId); + return (nRecId == BIFF_ID_CONT) || (nRecId == BIFF_ID_UNKNOWN); } bool BiffInputStream::jumpToNextContinue() diff --git a/sc/source/filter/oox/pivotcachebuffer.cxx b/sc/source/filter/oox/pivotcachebuffer.cxx index 4a7ca8ff446f..9ea4b8512dca 100644 --- a/sc/source/filter/oox/pivotcachebuffer.cxx +++ b/sc/source/filter/oox/pivotcachebuffer.cxx @@ -419,8 +419,7 @@ PCSharedItemsModel::PCSharedItemsModel() : mbHasMixed( false ), mbIsNumeric( false ), mbIsInteger( false ), - mbHasLongText( false ), - mbHasLongIndexes( false ) + mbHasLongText( false ) { } @@ -918,7 +917,7 @@ void PivotCacheField::importPCRecordItem( SequenceInputStream& rStrm, WorksheetH void PivotCacheField::importPCItemIndex( BiffInputStream& rStrm, WorksheetHelper& rSheetHelper, sal_Int32 nCol, sal_Int32 nRow ) const { OSL_ENSURE( hasSharedItems(), "PivotCacheField::importPCItemIndex - invalid call, no shared items found" ); - sal_Int32 nIndex = maSharedItemsModel.mbHasLongIndexes ? rStrm.readuInt16() : rStrm.readuInt8(); + sal_Int32 nIndex = rStrm.readuInt8(); writeSharedItemToSourceDataCell( rSheetHelper, nCol, nRow, nIndex ); } @@ -956,7 +955,6 @@ PCDefinitionModel::PCDefinitionModel() : mfRefreshedDate( 0.0 ), mnRecords( 0 ), mnMissItemsLimit( 0 ), - mnDatabaseFields( 0 ), mbInvalid( false ), mbSaveData( true ), mbRefreshOnLoad( false ), @@ -1093,7 +1091,7 @@ void PivotCache::importPCDSheetSource( SequenceInputStream& rStrm, const Relatio PivotCacheField& PivotCache::createCacheField( bool bInitDatabaseField ) { - bool bIsDatabaseField = !bInitDatabaseField || (maFields.size() < maDefModel.mnDatabaseFields); + bool bIsDatabaseField = !bInitDatabaseField; PivotCacheFieldVector::value_type xCacheField( new PivotCacheField( *this, bIsDatabaseField ) ); maFields.push_back( xCacheField ); return *xCacheField; diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx index 20bfade03e5d..096e6959a74a 100644 --- a/sc/source/filter/oox/workbookhelper.cxx +++ b/sc/source/filter/oox/workbookhelper.cxx @@ -266,7 +266,6 @@ private: ProgressBarPtr mxProgressBar; /// The progress bar. StorageRef mxVbaPrjStrg; /// Storage containing the VBA project. sal_Int16 mnCurrSheet; /// Current sheet index in Calc document. - bool mbWorkbook; /// True = multi-sheet file. bool mbGeneratorKnownGood; /// Whether reading a file generated by Excel or Calc. // buffers @@ -526,7 +525,6 @@ void WorkbookGlobals::initialize() maCellStyleServ = "com.sun.star.style.CellStyle"; maPageStyleServ = "com.sun.star.style.PageStyle"; mnCurrSheet = -1; - mbWorkbook = true; mbGeneratorKnownGood = false; meTextEnc = osl_getThreadTextEncoding(); diff --git a/sd/source/ui/dlg/TemplateScanner.cxx b/sd/source/ui/dlg/TemplateScanner.cxx index ab816b504af2..edc802bdc462 100644 --- a/sd/source/ui/dlg/TemplateScanner.cxx +++ b/sd/source/ui/dlg/TemplateScanner.cxx @@ -153,7 +153,6 @@ TemplateScanner::TemplateScanner() maFolderContent(), mpTemplateDirectory(nullptr), maFolderList(), - mbEntrySortingEnabled(false), mpLastAddedEntry(nullptr), mpFolderDescriptors(new FolderDescriptorList()), mxTemplateRoot(), @@ -353,7 +352,7 @@ TemplateScanner::State TemplateScanner::ScanFolder() // Scan the folder and insert it into the list of template // folders. mpTemplateDirectory = new TemplateDir; - mpTemplateDirectory->EnableSorting(mbEntrySortingEnabled); + mpTemplateDirectory->EnableSorting(false); // Continue with scanning all entries in the folder. eNextState = INITIALIZE_ENTRY_SCAN; } diff --git a/sd/source/ui/dlg/docprev.cxx b/sd/source/ui/dlg/docprev.cxx index 32297a464562..640dec1a7032 100644 --- a/sd/source/ui/dlg/docprev.cxx +++ b/sd/source/ui/dlg/docprev.cxx @@ -62,7 +62,7 @@ VCL_BUILDER_DECL_FACTORY(SdDocPreviewWin) } SdDocPreviewWin::SdDocPreviewWin( vcl::Window* pParent, const WinBits nStyle ) -: Control(pParent, nStyle), pMetaFile( nullptr ), mpObj(nullptr), mnShowPage(0) +: Control(pParent, nStyle), pMetaFile( nullptr ) { SetBorderStyle( WindowBorderStyle::MONO ); svtools::ColorConfig aColorConfig; @@ -182,9 +182,6 @@ bool SdDocPreviewWin::Notify( NotifyEvent& rNEvt ) void SdDocPreviewWin::updateViewSettings() { - ::sd::DrawDocShell* pDocShell = dynamic_cast< ::sd::DrawDocShell *>( mpObj ); - SdDrawDocument* pDoc = pDocShell?pDocShell->GetDoc():nullptr; - SvtAccessibilityOptions aAccOptions; bool bUseWhiteColor = !aAccOptions.GetIsForPagePreviews() && GetSettings().GetStyleSettings().GetHighContrastMode(); if( bUseWhiteColor ) @@ -197,71 +194,8 @@ void SdDocPreviewWin::updateViewSettings() maDocumentColor = Color( aColorConfig.GetColorValue( svtools::DOCCOLOR ).nColor ); } - GDIMetaFile* pMtf = nullptr; - - if(pDoc) - { - SdPage * pPage = pDoc->GetSdPage( mnShowPage, PageKind::Standard ); - if( pPage ) - { - SdrOutliner& rOutl = pDoc->GetDrawOutliner(); - Color aOldBackgroundColor = rOutl.GetBackgroundColor(); - rOutl.SetBackgroundColor( maDocumentColor ); - - pMtf = new GDIMetaFile; - - ScopedVclPtrInstance< VirtualDevice > pVDev; - - const Fraction aFrac( pDoc->GetScaleFraction() ); - const MapMode aMap( pDoc->GetScaleUnit(), Point(), aFrac, aFrac ); - - pVDev->SetMapMode( aMap ); - - // Disable output, as we only want to record a metafile - pVDev->EnableOutput( false ); - - pMtf->Record( pVDev ); - - ::sd::DrawView* pView = new ::sd::DrawView(pDocShell, this, nullptr); - - const Size aSize( pPage->GetSize() ); - - pView->SetBordVisible( false ); - pView->SetPageVisible( false ); - pView->ShowSdrPage( pPage ); - - const Point aNewOrg( pPage->GetLftBorder(), pPage->GetUppBorder() ); - const Size aNewSize( aSize.Width() - pPage->GetLftBorder() - pPage->GetRgtBorder(), - aSize.Height() - pPage->GetUppBorder() - pPage->GetLwrBorder() ); - const Rectangle aClipRect( aNewOrg, aNewSize ); - MapMode aVMap( aMap ); - - pVDev->Push(); - aVMap.SetOrigin( Point( -aNewOrg.X(), -aNewOrg.Y() ) ); - pVDev->SetRelativeMapMode( aVMap ); - pVDev->IntersectClipRegion( aClipRect ); - - // Use new StandardCheckVisisbilityRedirector - StandardCheckVisisbilityRedirector aRedirector; - const Rectangle aRedrawRectangle( Point(), aNewSize ); - vcl::Region aRedrawRegion(aRedrawRectangle); - pView->SdrPaintView::CompleteRedraw(pVDev,aRedrawRegion,&aRedirector); - - pVDev->Pop(); - - pMtf->Stop(); - pMtf->WindStart(); - pMtf->SetPrefMapMode( aMap ); - pMtf->SetPrefSize( aNewSize ); - - rOutl.SetBackgroundColor( aOldBackgroundColor ); - - delete pView; - } - } - delete pMetaFile; - pMetaFile = pMtf; + pMetaFile = nullptr; Invalidate(); } diff --git a/sd/source/ui/inc/TemplateScanner.hxx b/sd/source/ui/inc/TemplateScanner.hxx index fdd6f5b6b340..9cba2b67159f 100644 --- a/sd/source/ui/inc/TemplateScanner.hxx +++ b/sd/source/ui/inc/TemplateScanner.hxx @@ -148,11 +148,7 @@ private: /** The data structure that is to be filled with information about the template files. */ - std::vector<TemplateDir*> maFolderList; - - /** Whether the template entries have to be sorted. - */ - bool mbEntrySortingEnabled; + std::vector<TemplateDir*> maFolderList; /** This member points into the maFolderList to the member that was most recently added. diff --git a/sd/source/ui/inc/docprev.hxx b/sd/source/ui/inc/docprev.hxx index ad2b14e77807..48269801b3c5 100644 --- a/sd/source/ui/inc/docprev.hxx +++ b/sd/source/ui/inc/docprev.hxx @@ -43,8 +43,6 @@ class SD_DLLPUBLIC SdDocPreviewWin : public Control, public SfxListener protected: GDIMetaFile* pMetaFile; Link<SdDocPreviewWin&,void> aClickHdl; - SfxObjectShell* mpObj; - sal_uInt16 mnShowPage; Color maDocumentColor; rtl::Reference< sd::SlideShow > mxSlideShow; diff --git a/sdext/source/presenter/PresenterPaneBase.cxx b/sdext/source/presenter/PresenterPaneBase.cxx index c8497ff76d55..0303cd9691c6 100644 --- a/sdext/source/presenter/PresenterPaneBase.cxx +++ b/sdext/source/presenter/PresenterPaneBase.cxx @@ -56,7 +56,6 @@ PresenterPaneBase::PresenterPaneBase ( msTitle(), mxComponentContext(rxContext), mpViewBackground(), - mbHasCallout(false), maCalloutAnchor() { if (mpPresenterController.get() != nullptr) @@ -363,16 +362,7 @@ void PresenterPaneBase::PaintBorder (const awt::Rectangle& rUpdateBox) PaintBorderBackground(aLocalBorderBox, rUpdateBox); - if (mbHasCallout) - mxBorderPainter->paintBorderWithCallout( - mxPaneId->getResourceURL(), - mxBorderCanvas, - aLocalBorderBox, - rUpdateBox, - msTitle, - maCalloutAnchor); - else - mxBorderPainter->paintBorder( + mxBorderPainter->paintBorder( mxPaneId->getResourceURL(), mxBorderCanvas, aLocalBorderBox, diff --git a/sdext/source/presenter/PresenterPaneBase.hxx b/sdext/source/presenter/PresenterPaneBase.hxx index e46c5d01368a..7a00416cc17b 100644 --- a/sdext/source/presenter/PresenterPaneBase.hxx +++ b/sdext/source/presenter/PresenterPaneBase.hxx @@ -123,7 +123,6 @@ protected: OUString msTitle; css::uno::Reference<css::uno::XComponentContext> mxComponentContext; SharedBitmapDescriptor mpViewBackground; - bool mbHasCallout; css::awt::Point maCalloutAnchor; virtual void CreateCanvases ( diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx index 5dcdaf2778e9..592420ef9b91 100644 --- a/sfx2/source/appl/appinit.cxx +++ b/sfx2/source/appl/appinit.cxx @@ -205,8 +205,6 @@ void SfxApplication::Initialize_Impl() Reference < XDesktop2 > xDesktop = Desktop::create ( ::comphelper::getProcessComponentContext() ); xDesktop->addTerminateListener( new SfxTerminateListener_Impl() ); - Application::EnableAutoHelpId(); - pImpl->pAppDispatch = new SfxStatusDispatcher; pImpl->pAppDispatch->acquire(); diff --git a/sw/inc/txatritr.hxx b/sw/inc/txatritr.hxx index 9843094fbe7e..178bf94cf4f6 100644 --- a/sw/inc/txatritr.hxx +++ b/sw/inc/txatritr.hxx @@ -58,7 +58,6 @@ class SwLanguageIterator const SfxPoolItem* pCurItem; size_t nAttrPos; sal_Int32 nChgPos; - sal_uInt16 nWhichId; void AddToStack( const SwTextAttr& rAttr ); void SearchNextChg(); diff --git a/sw/source/core/txtnode/txatritr.cxx b/sw/source/core/txtnode/txatritr.cxx index d98607e1e9e7..9048fde21b2a 100644 --- a/sw/source/core/txtnode/txatritr.cxx +++ b/sw/source/core/txtnode/txatritr.cxx @@ -99,8 +99,7 @@ SwLanguageIterator::SwLanguageIterator( const SwTextNode& rTNd, rTextNd( rTNd ), pParaItem( nullptr ), nAttrPos( 0 ), - nChgPos( nStt ), - nWhichId( RES_CHRATR_LANGUAGE ) + nChgPos( nStt ) { SearchNextChg(); } @@ -138,7 +137,7 @@ bool SwLanguageIterator::Next() if( RES_TXTATR_CHARFMT == pHt->Which() ) { - const sal_uInt16 nWId = GetWhichOfScript( nWhichId, aSIter.GetCurrScript() ); + const sal_uInt16 nWId = GetWhichOfScript( RES_CHRATR_LANGUAGE, aSIter.GetCurrScript() ); pCurItem = &pHt->GetCharFormat().GetCharFormat()->GetFormatAttr(nWId); } else @@ -179,7 +178,7 @@ void SwLanguageIterator::SearchNextChg() } if( !pParaItem ) { - nWh = GetWhichOfScript( nWhichId, aSIter.GetCurrScript() ); + nWh = GetWhichOfScript( RES_CHRATR_LANGUAGE, aSIter.GetCurrScript() ); pParaItem = &rTextNd.GetSwAttrSet().Get( nWh ); } @@ -192,7 +191,7 @@ void SwLanguageIterator::SearchNextChg() { if( !nWh ) { - nWh = GetWhichOfScript( nWhichId, aSIter.GetCurrScript() ); + nWh = GetWhichOfScript( RES_CHRATR_LANGUAGE, aSIter.GetCurrScript() ); } const SfxPoolItem* pItem = nullptr; diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index ded416e534e7..b289645121ab 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -239,7 +239,6 @@ struct ImplSVHelpData bool mbQuickHelp = false; // is QuickHelp enabled bool mbSetKeyboardHelp = false; // tiphelp was activated by keyboard bool mbKeyboardHelp = false; // tiphelp was activated by keyboard - bool mbAutoHelpId = true; // generate HelpIds bool mbRequestingHelp = false; // In Window::RequestHelp VclPtr<HelpTextWindow> mpHelpWin; // HelpWindow sal_uInt64 mnLastHelpHideTime = 0; // ticks of last show diff --git a/vcl/inc/unx/i18n_ic.hxx b/vcl/inc/unx/i18n_ic.hxx index 037680cbc21e..28ec8ccfec93 100644 --- a/vcl/inc/unx/i18n_ic.hxx +++ b/vcl/inc/unx/i18n_ic.hxx @@ -33,7 +33,6 @@ private: Bool mbUseable; // system supports current locale ? XIC maContext; - XIMStyle mnSupportedStatusStyle; XIMStyle mnSupportedPreeditStyle; XIMStyle mnStatusStyle; XIMStyle mnPreeditStyle; diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index b5026c83ad8b..2efd08f451e9 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -1382,11 +1382,6 @@ Help* Application::GetHelp() return ImplGetSVData()->maAppData.mpHelp; } -void Application::EnableAutoHelpId() -{ - ImplGetSVData()->maHelpData.mbAutoHelpId = true; -} - OUString Application::GetToolkitName() { ImplSVData* pSVData = ImplGetSVData(); diff --git a/vcl/source/control/longcurr.cxx b/vcl/source/control/longcurr.cxx index 656693a69968..899677d87d61 100644 --- a/vcl/source/control/longcurr.cxx +++ b/vcl/source/control/longcurr.cxx @@ -36,8 +36,6 @@ using namespace ::comphelper; namespace { -#define FORMAT_LONGCURRENCY 4 - BigInt ImplPower10( sal_uInt16 n ) { sal_uInt16 i; @@ -289,7 +287,6 @@ void LongCurrencyFormatter::ImpInit() mnMax *= 0x7FFFFFFF; mnCorrectedValue = 0; mnDecimalDigits = 0; - mnType = FORMAT_LONGCURRENCY; mbThousandSep = true; SetDecimalDigits( 0 ); } diff --git a/vcl/source/control/morebtn.cxx b/vcl/source/control/morebtn.cxx index 4cbf7af304dd..90f968321342 100644 --- a/vcl/source/control/morebtn.cxx +++ b/vcl/source/control/morebtn.cxx @@ -32,7 +32,6 @@ struct ImplMoreButtonData void MoreButton::ImplInit( vcl::Window* pParent, WinBits nStyle ) { mpMBData = new ImplMoreButtonData; - meUnit = MapUnit::MapPixel; mbState = false; mpMBData->mpItemList = nullptr; @@ -91,7 +90,7 @@ void MoreButton::Click() { vcl::Window* pParent = GetParent(); Size aSize( pParent->GetSizePixel() ); - long nDeltaPixel = LogicToPixel( Size( 0, 0 ), meUnit ).Height(); + long nDeltaPixel = LogicToPixel( Size( 0, 0 ), MapUnit::MapPixel ).Height(); // Change status mbState = !mbState; diff --git a/vcl/unx/generic/app/i18n_ic.cxx b/vcl/unx/generic/app/i18n_ic.cxx index abac4c89af76..21691b56657a 100644 --- a/vcl/unx/generic/app/i18n_ic.cxx +++ b/vcl/unx/generic/app/i18n_ic.cxx @@ -119,16 +119,17 @@ get_font_set( Display *p_display ) return p_font_set; } +static const XIMStyle g_nSupportedStatusStyle( + XIMStatusCallbacks | + XIMStatusNothing | + XIMStatusNone + ); + // Constructor for a InputContext (IC) SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame ) : mbUseable( True ), maContext( nullptr ), - mnSupportedStatusStyle( - XIMStatusCallbacks | - XIMStatusNothing | - XIMStatusNone - ), mnSupportedPreeditStyle( XIMPreeditCallbacks | XIMPreeditNothing | @@ -469,7 +470,7 @@ Bool SalI18N_InputContext::IsSupportedIMStyle( XIMStyle nStyle ) const { if ( (nStyle & mnSupportedPreeditStyle) - && (nStyle & mnSupportedStatusStyle) ) + && (nStyle & g_nSupportedStatusStyle) ) { return True; } @@ -500,7 +501,7 @@ SalI18N_InputContext::SupportInputMethodStyle( XIMStyles *pIMStyles ) { nBestScore = nActualScore; mnPreeditStyle = nProvidedStyle & mnSupportedPreeditStyle; - mnStatusStyle = nProvidedStyle & mnSupportedStatusStyle; + mnStatusStyle = nProvidedStyle & g_nSupportedStatusStyle; } } } |