diff options
-rw-r--r-- | sc/inc/editsrc.hxx | 15 | ||||
-rw-r--r-- | sc/inc/textuno.hxx | 3 | ||||
-rw-r--r-- | sc/source/ui/Accessibility/AccessibleText.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/unoobj/editsrc.cxx | 17 | ||||
-rw-r--r-- | sc/source/ui/unoobj/textuno.cxx | 3 |
5 files changed, 3 insertions, 37 deletions
diff --git a/sc/inc/editsrc.hxx b/sc/inc/editsrc.hxx index 76911d5d8463..1628d1039b81 100644 --- a/sc/inc/editsrc.hxx +++ b/sc/inc/editsrc.hxx @@ -39,25 +39,10 @@ class ScEditEngineDefaulter; class SvxEditEngineForwarder; class ScDocShell; -class ScHeaderFooterContentObj; class ScCellTextData; class ScHeaderFooterTextData; class ScAccessibleTextData; class SdrObject; -class EditTextObject; - - -class ScHeaderFooterChangedHint : public SfxHint -{ - sal_uInt16 nPart; - -public: - TYPEINFO(); - ScHeaderFooterChangedHint(sal_uInt16 nP); - ~ScHeaderFooterChangedHint(); - - sal_uInt16 GetPart() const { return nPart; } -}; /** * ScHeaderFooterEditSource with local copy of ScHeaderFooterTextData is diff --git a/sc/inc/textuno.hxx b/sc/inc/textuno.hxx index 2eea0c38dd32..db2d66064460 100644 --- a/sc/inc/textuno.hxx +++ b/sc/inc/textuno.hxx @@ -127,8 +127,7 @@ private: sal_uInt16 nPart; ScEditEngineDefaulter* pEditEngine; SvxEditEngineForwarder* pForwarder; - sal_Bool bDataValid; - sal_Bool bInUpdate; + bool bDataValid; public: ScHeaderFooterTextData( diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx index 92a7876a50fa..d9a4486425fa 100644 --- a/sc/source/ui/Accessibility/AccessibleText.cxx +++ b/sc/source/ui/Accessibility/AccessibleText.cxx @@ -1418,7 +1418,7 @@ SvxTextForwarder* ScAccessiblePreviewHeaderCellTextData::GetTextForwarder() pEditEngine->SetText( maText ); } - bDataValid = sal_True; + bDataValid = true; if (pEditEngine) pEditEngine->SetNotifyHdl( LINK(this, ScAccessibleCellTextData, NotifyHdl) ); diff --git a/sc/source/ui/unoobj/editsrc.cxx b/sc/source/ui/unoobj/editsrc.cxx index 1128596e6263..fb4782dabdad 100644 --- a/sc/source/ui/unoobj/editsrc.cxx +++ b/sc/source/ui/unoobj/editsrc.cxx @@ -50,23 +50,6 @@ #include "postit.hxx" #include "AccessibleText.hxx" -//------------------------------------------------------------------------ - -TYPEINIT1( ScHeaderFooterChangedHint, SfxHint ); - -ScHeaderFooterChangedHint::ScHeaderFooterChangedHint(sal_uInt16 nP) : - nPart( nP ) -{ -} - -ScHeaderFooterChangedHint::~ScHeaderFooterChangedHint() -{ -} - -//------------------------------------------------------------------------ - -// each ScHeaderFooterEditSource object has its own ScHeaderFooterTextData - ScHeaderFooterEditSource::ScHeaderFooterEditSource(ScHeaderFooterTextData* pData) : mpTextData(pData) {} diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx index 5bab305e7776..daa1146b5197 100644 --- a/sc/source/ui/unoobj/textuno.cxx +++ b/sc/source/ui/unoobj/textuno.cxx @@ -202,8 +202,7 @@ ScHeaderFooterTextData::ScHeaderFooterTextData( nPart( nP ), pEditEngine( NULL ), pForwarder( NULL ), - bDataValid( false ), - bInUpdate( false ) + bDataValid(false) { rContentObj.acquire(); // must not go away } |