summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Glazunov <vg@openoffice.org>2010-03-24 14:12:03 +0100
committerVladimir Glazunov <vg@openoffice.org>2010-03-24 14:12:03 +0100
commit69fdfa4f91c220902592c26fa9f58ae8c1033176 (patch)
tree277b621754a03038e0c3d7ee9bd71dbb86662d10
parente5c150fccaac17c47893884615fcb323545a6b60 (diff)
parent326c94dad1684a1523f21ea476294348dcf49a04 (diff)
CWS-TOOLING: integrate CWS mtaccfixesooo/DEV300_m76
-rw-r--r--starmath/source/accessibility.cxx4
-rw-r--r--starmath/source/accessibility.hxx1
-rw-r--r--sw/source/ui/uiview/pview.cxx3
3 files changed, 7 insertions, 1 deletions
diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx
index 10ba6f9fbd..c9972a9702 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -1158,6 +1158,10 @@ XubString SmTextForwarder::CalcFieldValue( const SvxFieldItem& rField, USHORT nP
return aTxt;
}
+void SmTextForwarder::FieldClicked(const SvxFieldItem&, USHORT, USHORT)
+{
+}
+
USHORT GetSvxEditEngineItemState( EditEngine& rEditEngine, const ESelection& rSel, USHORT nWhich )
{
EECharAttribArray aAttribs;
diff --git a/starmath/source/accessibility.hxx b/starmath/source/accessibility.hxx
index f031f0d9b5..d50d181090 100644
--- a/starmath/source/accessibility.hxx
+++ b/starmath/source/accessibility.hxx
@@ -236,6 +236,7 @@ public:
virtual SfxItemPool* GetPool() const;
virtual XubString CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rpTxtColor, Color*& rpFldColor );
+ virtual void FieldClicked(const SvxFieldItem&, USHORT, USHORT);
virtual BOOL IsValid() const;
virtual LanguageType GetLanguage( USHORT, USHORT ) const;
diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx
index f6b49a2cc8..2d1ed91ef7 100644
--- a/sw/source/ui/uiview/pview.cxx
+++ b/sw/source/ui/uiview/pview.cxx
@@ -1564,7 +1564,8 @@ void SwPagePreView::GetState( SfxItemSet& rSet )
ASSERT(nWhich, leeres Set);
SwPagePreviewLayout* pPagePrevwLay = GetViewShell()->PagePreviewLayout();
//#106746# zoom has to be disabled if Accessibility support is switched on
- BOOL bZoomEnabled = !Application::GetSettings().GetMiscSettings().GetEnableATToolSupport();
+ // MT 2010/01, see #110498#
+ BOOL bZoomEnabled = TRUE; // !Application::GetSettings().GetMiscSettings().GetEnableATToolSupport();
while(nWhich)
{