You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by st...@apache.org on 2013/04/23 11:51:53 UTC
svn commit: r1470868 [33/40] - in /openoffice/branches/ia2: ./
ext_libraries/coinmp/ ext_libraries/serf/ ext_libraries/serf/win/
extras/l10n/source/fi/ main/ main/animations/source/animcore/
main/automation/source/communi/ main/basctl/source/basicide/ ...
Modified: openoffice/branches/ia2/main/sw/source/core/txtnode/fntcache.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/core/txtnode/fntcache.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/core/txtnode/fntcache.cxx (original)
+++ openoffice/branches/ia2/main/sw/source/core/txtnode/fntcache.cxx Tue Apr 23 09:51:15 2013
@@ -710,115 +710,136 @@ static void lcl_DrawLineForWrongListData
const CalcLinePosData &rCalcLinePosData,
const Size &rPrtFontSize )
{
- if (!pWList)
- return;
+ if (!pWList) return;
xub_StrLen nStart = rInf.GetIdx();
xub_StrLen nWrLen = rInf.GetLen();
// check if respective data is available in the current text range
- if (pWList->Check( nStart, nWrLen ))
+ if (!pWList->Check( nStart, nWrLen ))
{
- // get line color to use...
- Color aLineColor;
- if (pWList == rInf.GetWrong()) // ... for spell checking
- aLineColor = SwViewOption::GetSpellColor();
- else if (pWList == rInf.GetGrammarCheck()) // ... for grammar checking
- // currently there is no specific color for grammar check errors available in the configuration
- aLineColor = Color( COL_LIGHTBLUE );
- else if (pWList == rInf.GetSmartTags()) // ... for smart tags
- aLineColor = SwViewOption::GetSmarttagColor();
-
- long nHght = rInf.GetOut().LogicToPixel( rPrtFontSize ).Height();
-
- // Draw wavy lines for spell and grammar errors only if font is large enough.
- // Lines for smart tags will always be drawn.
- if (pWList == rInf.GetSmartTags() || WRONG_SHOW_MIN < nHght)
- {
- SwForbidden::iterator pIter = rForbidden.begin();
- if (rInf.GetOut().GetConnectMetaFile())
- rInf.GetOut().Push();
-
- const Color aCol( rInf.GetOut().GetLineColor() );
- const sal_Bool bColSave = aCol != aLineColor;
- if (bColSave)
- rInf.GetOut().SetLineColor( aLineColor );
-
- // iterate over all ranges stored in the respective SwWrongList
- do
- {
- nStart = nStart - rInf.GetIdx();
-
- const xub_StrLen nEnd = nStart + nWrLen;
- xub_StrLen nNext = nStart;
- while( nNext < nEnd )
- {
- while( pIter != rForbidden.end() && pIter->second <= nNext )
- ++pIter;
- xub_StrLen nNextStart = nNext;
- xub_StrLen nNextEnd = nEnd;
- if( pIter == rForbidden.end() || nNextEnd <= pIter->first )
- {
- // No overlapping mark up found
- std::pair< xub_StrLen, xub_StrLen > aNew;
- aNew.first = nNextStart;
- aNew.second = nNextEnd;
- rForbidden.insert( pIter, aNew );
- pIter = rForbidden.begin();
- nNext = nEnd;
- }
- else
- {
- nNext = pIter->second;
- if( nNextStart < pIter->first )
- {
- nNextEnd = pIter->first;
- pIter->first = nNextStart;
- }
- else
- continue;
- }
- // determine line pos
- Point aStart( rInf.GetPos() );
- Point aEnd;
- lcl_calcLinePos( rCalcLinePosData, aStart, aEnd, nNextStart, nNextEnd - nNextStart );
+ return;
+ }
- // draw line for smart tags?
- if (pWList == rInf.GetSmartTags())
- {
- aStart.Y() +=30;
- aEnd.Y() +=30;
+ long nHght = rInf.GetOut().LogicToPixel( rPrtFontSize ).Height();
+
+ // Draw wavy lines for spell and grammar errors only if font is large enough.
+ // Lines for smart tags will always be drawn.
+ if (pWList != rInf.GetSmartTags() && WRONG_SHOW_MIN >= nHght)
+ {
+ return;
+ }
- LineInfo aLineInfo( LINE_DASH );
- aLineInfo.SetDistance( 40 );
- aLineInfo.SetDashLen( 1 );
- aLineInfo.SetDashCount(1);
+ SwForbidden::iterator pIter = rForbidden.begin();
+ if (rInf.GetOut().GetConnectMetaFile())
+ rInf.GetOut().Push();
- rInf.GetOut().DrawLine( aStart, aEnd, aLineInfo );
- }
- else // draw wavy lines for spell or grammar errors
- {
- // get wavy line type to use
- sal_uInt16 nWave =
- WRONG_SHOW_MEDIUM < nHght ? WAVE_NORMAL :
- ( WRONG_SHOW_SMALL < nHght ? WAVE_SMALL : WAVE_FLAT );
+ const Color aCol( rInf.GetOut().GetLineColor() );
- rInf.GetOut().DrawWaveLine( aStart, aEnd, nWave );
- }
- }
+ // iterate over all ranges stored in the respective SwWrongList
+ do
+ {
+ nStart = nStart - rInf.GetIdx();
- nStart = nEnd + rInf.GetIdx();
- nWrLen = rInf.GetIdx() + rInf.GetLen() - nStart;
+ const xub_StrLen nEnd = nStart + nWrLen;
+ xub_StrLen nNext = nStart;
+ while( nNext < nEnd )
+ {
+ while( pIter != rForbidden.end() && pIter->second <= nNext )
+ ++pIter;
+
+ xub_StrLen nNextStart = nNext;
+ xub_StrLen nNextEnd = nEnd;
+
+ if( pIter == rForbidden.end() || nNextEnd <= pIter->first )
+ {
+ // No overlapping mark up found
+ std::pair< xub_StrLen, xub_StrLen > aNew;
+ aNew.first = nNextStart;
+ aNew.second = nNextEnd;
+ rForbidden.insert( pIter, aNew );
+ pIter = rForbidden.begin();
+ nNext = nEnd;
}
- while (nWrLen && pWList->Check( nStart, nWrLen ));
+ else
+ {
+ nNext = pIter->second;
+ if( nNextStart < pIter->first )
+ {
+ nNextEnd = pIter->first;
+ pIter->first = nNextStart;
+ }
+ else
+ continue;
+ }
+ // determine line pos
+ Point aStart( rInf.GetPos() );
+ Point aEnd;
+ lcl_calcLinePos( rCalcLinePosData, aStart, aEnd, nNextStart, nNextEnd - nNextStart );
+
- if (bColSave)
- rInf.GetOut().SetLineColor( aCol );
+ sal_uInt16 wrongPos = pWList->GetWrongPos(nNextStart + rInf.GetIdx());
+
+ const SwWrongArea* wrongArea = pWList->GetElement(wrongPos);
+
+ if (wrongArea != 0)
+ {
+ if (WRONGAREA_DASHED == wrongArea->mLineType)
+ {
+ rInf.GetOut().SetLineColor( wrongArea->mColor );
- if (rInf.GetOut().GetConnectMetaFile())
- rInf.GetOut().Pop();
+ aStart.Y() +=30;
+ aEnd.Y() +=30;
+
+ LineInfo aLineInfo( LINE_DASH );
+ aLineInfo.SetDistance( 40 );
+ aLineInfo.SetDashLen( 1 );
+ aLineInfo.SetDashCount(1);
+
+ rInf.GetOut().DrawLine( aStart, aEnd, aLineInfo );
+ }
+ else if (WRONGAREA_WAVE == wrongArea->mLineType)
+ {
+ rInf.GetOut().SetLineColor( wrongArea->mColor );
+
+ // get wavy line type to use
+ sal_uInt16 nWave =
+ WRONG_SHOW_MEDIUM < nHght ? WAVE_NORMAL :
+ ( WRONG_SHOW_SMALL < nHght ? WAVE_SMALL : WAVE_FLAT );
+
+ rInf.GetOut().DrawWaveLine( aStart, aEnd, nWave );
+ }
+ else if (WRONGAREA_WAVE_NORMAL == wrongArea->mLineType)
+ {
+ rInf.GetOut().SetLineColor( wrongArea->mColor );
+
+ rInf.GetOut().DrawWaveLine( aStart, aEnd, WAVE_NORMAL);
+ }
+
+ else if (WRONGAREA_WAVE_SMALL == wrongArea->mLineType)
+ {
+ rInf.GetOut().SetLineColor( wrongArea->mColor );
+
+ rInf.GetOut().DrawWaveLine( aStart, aEnd, WAVE_SMALL);
+ }
+ else if (WRONGAREA_WAVE_FLAT == wrongArea->mLineType)
+ {
+ rInf.GetOut().SetLineColor( wrongArea->mColor );
+
+ rInf.GetOut().DrawWaveLine( aStart, aEnd, WAVE_FLAT);
+ }
+ }
}
+
+ nStart = nEnd + rInf.GetIdx();
+ nWrLen = rInf.GetIdx() + rInf.GetLen() - nStart;
}
+ while (nWrLen && pWList->Check( nStart, nWrLen ));
+
+ rInf.GetOut().SetLineColor( aCol );
+
+ if (rInf.GetOut().GetConnectMetaFile())
+ rInf.GetOut().Pop();
}
Modified: openoffice/branches/ia2/main/sw/source/core/txtnode/txtedt.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/core/txtnode/txtedt.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/core/txtnode/txtedt.cxx (original)
+++ openoffice/branches/ia2/main/sw/source/core/txtnode/txtedt.cxx Tue Apr 23 09:51:15 2013
@@ -88,6 +88,7 @@
#include <vector>
+#include <unotextrange.hxx>
using rtl::OUString;
using namespace ::com::sun::star;
@@ -1352,7 +1353,14 @@ SwRect SwTxtFrm::SmartTagScan( SwCntntNo
Reference< ::com::sun::star::frame::XController > xController = pNode->GetDoc()->GetDocShell()->GetController();
- xub_StrLen nLangBegin = nBegin;
+ SwPosition start(*pNode, nBegin);
+ SwPosition end (*pNode, nEnd);
+ Reference< ::com::sun::star::text::XTextRange > xRange = SwXTextRange::CreateXTextRange(*pNode->GetDoc(), start, &end);
+
+ rSmartTagMgr.RecognizeTextRange(xRange, xTextMarkup, xController);
+
+
+ xub_StrLen nLangBegin = nBegin;
xub_StrLen nLangEnd = nEnd;
// smart tag recognization has to be done for each language portion:
@@ -1367,7 +1375,7 @@ SwRect SwTxtFrm::SmartTagScan( SwCntntNo
const sal_uInt32 nExpandBegin = ModelToViewHelper::ConvertToViewPosition( pConversionMap, nLangBegin );
const sal_uInt32 nExpandEnd = ModelToViewHelper::ConvertToViewPosition( pConversionMap, nLangEnd );
- rSmartTagMgr.Recognize( aExpandText, xTextMarkup, xController, aLocale, nExpandBegin, nExpandEnd - nExpandBegin );
+ rSmartTagMgr.RecognizeString(aExpandText, xTextMarkup, xController, aLocale, nExpandBegin, nExpandEnd - nExpandBegin );
nLangBegin = nLangEnd;
}
Modified: openoffice/branches/ia2/main/sw/source/core/unocore/unofield.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/core/unocore/unofield.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/core/unocore/unofield.cxx (original)
+++ openoffice/branches/ia2/main/sw/source/core/unocore/unofield.cxx Tue Apr 23 09:51:15 2013
@@ -2190,7 +2190,7 @@ uno::Any SwXTextField::getPropertyValue(
break;
case FIELD_PROP_IS_FIELD_USED:
case FIELD_PROP_IS_FIELD_DISPLAYED:
- aRet.setValue( sal_False, ::getCppuBooleanType() );
+ aRet.setValue( NULL, ::getCppuBooleanType() );
break;
}
}
Modified: openoffice/branches/ia2/main/sw/source/core/unocore/unoflatpara.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/core/unocore/unoflatpara.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/core/unocore/unoflatpara.cxx (original)
+++ openoffice/branches/ia2/main/sw/source/core/unocore/unoflatpara.cxx Tue Apr 23 09:51:15 2013
@@ -50,6 +50,9 @@
#include <IGrammarContact.hxx>
#include <viewopt.hxx>
+#include <com/sun/star/lang/XUnoTunnel.hpp>
+#include <com/sun/star/text/XTextRange.hpp>
+
using namespace ::com::sun::star;
/******************************************************************************
@@ -117,10 +120,18 @@ css::uno::Reference< css::container::XSt
return SwXTextMarkup::getMarkupInfoContainer();
}
-void SAL_CALL SwXFlatParagraph::commitTextMarkup(::sal_Int32 nType, const ::rtl::OUString & rIdentifier, ::sal_Int32 nStart, ::sal_Int32 nLength, const css::uno::Reference< css::container::XStringKeyMap > & rxMarkupInfoContainer) throw (css::uno::RuntimeException)
+void SAL_CALL SwXFlatParagraph::commitTextRangeMarkup(::sal_Int32 nType, const ::rtl::OUString & aIdentifier, const uno::Reference< text::XTextRange> & xRange,
+ const css::uno::Reference< css::container::XStringKeyMap > & xMarkupInfoContainer) throw (uno::RuntimeException)
+{
+ vos::OGuard aGuard(Application::GetSolarMutex());
+ SwXTextMarkup::commitTextRangeMarkup( nType, aIdentifier, xRange, xMarkupInfoContainer );
+}
+
+
+void SAL_CALL SwXFlatParagraph::commitStringMarkup(::sal_Int32 nType, const ::rtl::OUString & rIdentifier, ::sal_Int32 nStart, ::sal_Int32 nLength, const css::uno::Reference< css::container::XStringKeyMap > & rxMarkupInfoContainer) throw (css::uno::RuntimeException)
{
vos::OGuard aGuard(Application::GetSolarMutex());
- SwXTextMarkup::commitTextMarkup( nType, rIdentifier, nStart, nLength, rxMarkupInfoContainer );
+ SwXTextMarkup::commitStringMarkup( nType, rIdentifier, nStart, nLength, rxMarkupInfoContainer );
}
// text::XFlatParagraph:
Modified: openoffice/branches/ia2/main/sw/source/core/unocore/unomap.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/core/unocore/unomap.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/core/unocore/unomap.cxx (original)
+++ openoffice/branches/ia2/main/sw/source/core/unocore/unomap.cxx Tue Apr 23 09:51:15 2013
@@ -482,6 +482,32 @@ SwUnoPropertyMapProvider::~SwUnoProperty
{ SW_PROP_NMID(UNO_NAME_IS_FIELD_USED), FIELD_PROP_IS_FIELD_USED, CPPU_E2T(CPPUTYPE_FLOAT), PropertyAttribute::READONLY, 0},\
{ SW_PROP_NMID(UNO_NAME_IS_FIELD_DISPLAYED), FIELD_PROP_IS_FIELD_DISPLAYED, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::READONLY, 0},\
+//IAccessibility2 Implementation 2009-----
+#define COMMON_ACCESSIBILITY_TEXT_ATTRIBUTE \
+ { SW_PROP_NMID(UNO_NAME_CHAR_BACK_COLOR), RES_CHRATR_BACKGROUND, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE ,MID_BACK_COLOR }, \
+ { SW_PROP_NMID(UNO_NAME_CHAR_COLOR), RES_CHRATR_COLOR, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, 0}, \
+ { SW_PROP_NMID(UNO_NAME_CHAR_CONTOURED), RES_CHRATR_CONTOUR, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0}, \
+ { SW_PROP_NMID(UNO_NAME_CHAR_EMPHASIS), RES_CHRATR_EMPHASIS_MARK, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, MID_EMPHASIS}, \
+ { SW_PROP_NMID(UNO_NAME_CHAR_ESCAPEMENT), RES_CHRATR_ESCAPEMENT, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, MID_ESC }, \
+ { SW_PROP_NMID(UNO_NAME_CHAR_FONT_NAME), RES_CHRATR_FONT, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY_NAME }, \
+ { SW_PROP_NMID(UNO_NAME_CHAR_HEIGHT), RES_CHRATR_FONTSIZE , CPPU_E2T(CPPUTYPE_FLOAT), PropertyAttribute::MAYBEVOID, MID_FONTHEIGHT|CONVERT_TWIPS}, \
+ { SW_PROP_NMID(UNO_NAME_CHAR_POSTURE), RES_CHRATR_POSTURE , CPPU_E2T(CPPUTYPE_FONTSLANT), PropertyAttribute::MAYBEVOID, MID_POSTURE}, \
+ { SW_PROP_NMID(UNO_NAME_CHAR_SHADOWED), RES_CHRATR_SHADOWED , CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0}, \
+ { SW_PROP_NMID(UNO_NAME_CHAR_STRIKEOUT), RES_CHRATR_CROSSEDOUT, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, MID_CROSS_OUT}, \
+ { SW_PROP_NMID(UNO_NAME_CHAR_UNDERLINE_COLOR), RES_CHRATR_UNDERLINE , CPPU_E2T(CPPUTYPE_INT32), PropertyAttribute::MAYBEVOID, MID_TL_COLOR}, \
+ { SW_PROP_NMID(UNO_NAME_CHAR_WEIGHT), RES_CHRATR_WEIGHT , CPPU_E2T(CPPUTYPE_FLOAT), PropertyAttribute::MAYBEVOID, MID_WEIGHT}, \
+ { SW_PROP_NMID(UNO_NAME_NUMBERING_LEVEL), RES_PARATR_LIST_LEVEL,CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, 0}, \
+ { SW_PROP_NMID(UNO_NAME_CHAR_UNDERLINE), RES_CHRATR_UNDERLINE , CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, MID_TL_STYLE}, \
+ { SW_PROP_NMID(UNO_NAME_NUMBERING_RULES), RES_PARATR_NUMRULE,CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, CONVERT_TWIPS}, \
+ { SW_PROP_NMID(UNO_NAME_PARA_ADJUST), RES_PARATR_ADJUST, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, MID_PARA_ADJUST}, \
+ { SW_PROP_NMID(UNO_NAME_PARA_BOTTOM_MARGIN), RES_UL_SPACE, CPPU_E2T(CPPUTYPE_INT32), PropertyAttribute::MAYBEVOID, MID_LO_MARGIN|CONVERT_TWIPS}, \
+ { SW_PROP_NMID(UNO_NAME_PARA_FIRST_LINE_INDENT), RES_LR_SPACE, CPPU_E2T(CPPUTYPE_INT32), PropertyAttribute::MAYBEVOID, MID_FIRST_LINE_INDENT|CONVERT_TWIPS}, \
+ { SW_PROP_NMID(UNO_NAME_PARA_LEFT_MARGIN), RES_LR_SPACE, CPPU_E2T(CPPUTYPE_INT32), PropertyAttribute::MAYBEVOID, MID_TXT_LMARGIN|CONVERT_TWIPS}, \
+ { SW_PROP_NMID(UNO_NAME_PARA_LINE_SPACING), RES_PARATR_LINESPACING, CPPU_E2T(CPPUTYPE_LINESPACE), PropertyAttribute::MAYBEVOID, CONVERT_TWIPS}, \
+ { SW_PROP_NMID(UNO_NAME_PARA_RIGHT_MARGIN), RES_LR_SPACE, CPPU_E2T(CPPUTYPE_INT32), PropertyAttribute::MAYBEVOID, MID_R_MARGIN|CONVERT_TWIPS}, \
+ { SW_PROP_NMID(UNO_NAME_TABSTOPS), RES_PARATR_TABSTOP, CPPU_E2T(CPPUTYPE_SEQTABSTOP), PropertyAttribute::MAYBEVOID, CONVERT_TWIPS}, \
+
+//-----IAccessibility2 Implementation 2009
const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(sal_uInt16 nPropertyId)
{
@@ -500,6 +526,18 @@ const SfxItemPropertyMapEntry* SwUnoProp
aMapEntriesArr[nPropertyId] = aCharAndParaMap_Impl;
}
break;
+ //IAccessibility2 Implementation 2009-----
+ case PROPERTY_MAP_ACCESSIBILITY_TEXT_ATTRIBUTE:
+ {
+ static SfxItemPropertyMapEntry aAccessibilityTextAttrMap_Impl[] =
+ {
+ COMMON_ACCESSIBILITY_TEXT_ATTRIBUTE
+ {0,0,0,0,0,0}
+ };
+ aMapEntriesArr[nPropertyId] = aAccessibilityTextAttrMap_Impl;
+ }
+ break;
+ //-----IAccessibility2 Implementation 2009
case PROPERTY_MAP_PARAGRAPH:
{
static SfxItemPropertyMapEntry aParagraphMap_Impl[] =
Modified: openoffice/branches/ia2/main/sw/source/core/unocore/unoobj.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/core/unocore/unoobj.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/core/unocore/unoobj.cxx (original)
+++ openoffice/branches/ia2/main/sw/source/core/unocore/unoobj.cxx Tue Apr 23 09:51:15 2013
@@ -99,6 +99,7 @@
#include <com/sun/star/text/XTextDocument.hpp>
#include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
#include <com/sun/star/drawing/XDrawPageSupplier.hpp>
+#include <com/sun/star/text/TextMarkupType.hpp>
#include <unoidx.hxx>
#include <unoframe.hxx>
#include <fmthdft.hxx>
@@ -2683,6 +2684,47 @@ throw (beans::UnknownPropertyException,
return aRet;
}
+void SAL_CALL SwXTextCursor::invalidateMarkings(::sal_Int32 nType)
+throw (uno::RuntimeException)
+{
+ vos::OGuard aGuard(Application::GetSolarMutex());
+
+ SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() );
+
+ SwNode* node = rUnoCursor.GetNode();
+
+ if (node == 0) return;
+
+ SwTxtNode* txtNode = node->GetTxtNode();
+
+ if (txtNode == 0) return;
+
+ if ( text::TextMarkupType::SPELLCHECK == nType )
+ {
+ txtNode->SetWrongDirty(true);
+ txtNode->SetWrong(0, true);
+ }
+ else if( text::TextMarkupType::PROOFREADING == nType )
+ {
+ txtNode->SetGrammarCheckDirty(true);
+ txtNode->SetGrammarCheck(0,true);
+ }
+ else if ( text::TextMarkupType::SMARTTAG == nType )
+ {
+ txtNode->SetSmartTagDirty(true);
+ txtNode->SetSmartTags (0, true);
+ }
+ else return;
+
+ SwFmtColl* fmtColl=txtNode->GetFmtColl();
+
+ if (fmtColl == 0) return;
+
+ SwFmtChg aNew( fmtColl );
+ txtNode->NotifyClients( 0, &aNew );
+}
+
+
/*-- 10.03.2008 09:58:47---------------------------------------------------
-----------------------------------------------------------------------*/
Modified: openoffice/branches/ia2/main/sw/source/core/unocore/unotextmarkup.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/core/unocore/unotextmarkup.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/core/unocore/unotextmarkup.cxx (original)
+++ openoffice/branches/ia2/main/sw/source/core/unocore/unotextmarkup.cxx Tue Apr 23 09:51:15 2013
@@ -36,6 +36,15 @@
#include <IGrammarContact.hxx>
+#include <com/sun/star/lang/XUnoTunnel.hpp>
+#include <com/sun/star/text/XTextRange.hpp>
+
+#include <pam.hxx>
+
+#include <unotextrange.hxx>
+#include <unotextcursor.hxx>
+
+
using namespace ::com::sun::star;
/*
@@ -62,7 +71,52 @@ uno::Reference< container::XStringKeyMap
return xProp;
}
-void SAL_CALL SwXTextMarkup::commitTextMarkup(
+void SAL_CALL SwXTextMarkup::commitTextRangeMarkup(::sal_Int32 nType, const ::rtl::OUString & aIdentifier, const uno::Reference< text::XTextRange> & xRange,
+ const uno::Reference< container::XStringKeyMap > & xMarkupInfoContainer) throw (uno::RuntimeException)
+{
+ vos::OGuard aGuard(Application::GetSolarMutex());
+
+ uno::Reference<lang::XUnoTunnel> xRangeTunnel( xRange, uno::UNO_QUERY);
+
+ if(!xRangeTunnel.is()) return;
+
+ SwXTextRange* pRange = 0;
+ OTextCursorHelper* pCursor = 0;
+
+ if(xRangeTunnel.is())
+ {
+ pRange = reinterpret_cast<SwXTextRange*>( sal::static_int_cast< sal_IntPtr >( xRangeTunnel->getSomething(SwXTextRange::getUnoTunnelId())));
+ pCursor = reinterpret_cast<OTextCursorHelper*>( sal::static_int_cast< sal_IntPtr >( xRangeTunnel->getSomething(OTextCursorHelper::getUnoTunnelId())));
+ }
+
+ if (pRange)
+ {
+ SwDoc* pDoc = reinterpret_cast<SwDoc*>(pRange->GetDoc());
+
+ if (!pDoc) return;
+
+ SwUnoInternalPaM aPam(*pDoc);
+
+ ::sw::XTextRangeToSwPaM(aPam, xRange);
+
+ SwPosition* startPos = aPam.Start();
+ SwPosition* endPos = aPam.End();
+
+ commitStringMarkup (nType, aIdentifier, startPos->nContent.GetIndex(), endPos->nContent.GetIndex() - startPos->nContent.GetIndex(), xMarkupInfoContainer);
+ }
+ else if (pCursor)
+ {
+ SwPaM aPam(*pCursor->GetPaM());
+
+ SwPosition* startPos = aPam.Start();
+ SwPosition* endPos = aPam.End();
+
+ commitStringMarkup (nType, aIdentifier, startPos->nContent.GetIndex(), endPos->nContent.GetIndex() - startPos->nContent.GetIndex(), xMarkupInfoContainer);
+ }
+}
+
+
+void SAL_CALL SwXTextMarkup::commitStringMarkup(
::sal_Int32 nType,
const ::rtl::OUString & rIdentifier,
::sal_Int32 nStart,
Modified: openoffice/branches/ia2/main/sw/source/core/view/viewimp.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/core/view/viewimp.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/core/view/viewimp.cxx (original)
+++ openoffice/branches/ia2/main/sw/source/core/view/viewimp.cxx Tue Apr 23 09:51:15 2013
@@ -446,6 +446,24 @@ void SwViewImp::MoveAccessible( const Sw
} while ( pTmp != pVSh );
}
+//IAccessibility2 Implementation 2009-----
+void SwViewImp::FirePageChangeEvent(sal_uInt16 nOldPage, sal_uInt16 nNewPage)
+{
+ if( IsAccessible() )
+ GetAccessibleMap().FirePageChangeEvent( nOldPage, nNewPage);
+}
+
+void SwViewImp::FireSectionChangeEvent(sal_uInt16 nOldSection, sal_uInt16 nNewSection)
+{
+ if( IsAccessible() )
+ GetAccessibleMap().FireSectionChangeEvent(nOldSection, nNewSection);
+}
+void SwViewImp::FireColumnChangeEvent(sal_uInt16 nOldColumn, sal_uInt16 nNewColumn)
+{
+ if( IsAccessible() )
+ GetAccessibleMap().FireColumnChangeEvent(nOldColumn, nNewColumn);
+}
+//-----IAccessibility2 Implementation 2009
void SwViewImp::InvalidateAccessibleFrmContent( const SwFrm *pFrm )
{
ASSERT( pFrm->IsAccessibleFrm(), "frame is not accessible" );
Modified: openoffice/branches/ia2/main/sw/source/filter/ww8/WW8TableInfo.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/filter/ww8/WW8TableInfo.hxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/filter/ww8/WW8TableInfo.hxx (original)
+++ openoffice/branches/ia2/main/sw/source/filter/ww8/WW8TableInfo.hxx Tue Apr 23 09:51:15 2013
@@ -26,6 +26,7 @@
#include <hash_map>
#include <string>
#include <map>
+#include <vector>
#include <functional>
#include <boost/shared_ptr.hpp>
#include <sal/types.h>
@@ -113,7 +114,48 @@ public:
string toString() const;
};
-class CellInfo;
+class CellInfo
+{
+ SwRect m_aRect;
+ WW8TableNodeInfo * m_pNodeInfo;
+ unsigned long m_nFmtFrmWidth;
+
+public:
+ CellInfo(const SwRect & aRect, WW8TableNodeInfo * pNodeInfo);
+
+ CellInfo(const CellInfo & aRectAndTableInfo)
+ : m_aRect(aRectAndTableInfo.m_aRect),
+ m_pNodeInfo(aRectAndTableInfo.m_pNodeInfo),
+ m_nFmtFrmWidth(aRectAndTableInfo.m_nFmtFrmWidth)
+ {
+ }
+
+ ~CellInfo() {}
+
+ bool operator < (const CellInfo & aCellInfo) const;
+
+ long top() const { return m_aRect.Top(); }
+ long bottom() const { return m_aRect.Bottom(); }
+ long left() const { return m_aRect.Left(); }
+ long right() const { return m_aRect.Right(); }
+ long width() const { return m_aRect.Width(); }
+ long height() const { return m_aRect.Height(); }
+ SwRect getRect() const { return m_aRect; }
+ WW8TableNodeInfo * getTableNodeInfo() const
+ { return m_pNodeInfo; }
+ unsigned long getFmtFrmWidth() const
+ {
+ return m_nFmtFrmWidth;
+ }
+
+ void setFmtFrmWidth(unsigned long nFmtFrmWidth)
+ {
+ m_nFmtFrmWidth = nFmtFrmWidth;
+ }
+
+ ::std::string toString() const;
+};
+
typedef ::std::multiset<CellInfo, less<CellInfo> > CellInfoMultiSet;
typedef boost::shared_ptr<CellInfoMultiSet> CellInfoMultiSetPtr;
@@ -306,47 +348,6 @@ public:
WW8TableNodeInfo * reorderByLayout(const SwTable * pTable);
};
-class CellInfo
-{
- SwRect m_aRect;
- WW8TableNodeInfo * m_pNodeInfo;
- unsigned long m_nFmtFrmWidth;
-
-public:
- CellInfo(const SwRect & aRect, WW8TableNodeInfo * pNodeInfo);
-
- CellInfo(const CellInfo & aRectAndTableInfo)
- : m_aRect(aRectAndTableInfo.m_aRect),
- m_pNodeInfo(aRectAndTableInfo.m_pNodeInfo),
- m_nFmtFrmWidth(aRectAndTableInfo.m_nFmtFrmWidth)
- {
- }
-
- ~CellInfo() {}
-
- bool operator < (const CellInfo & aCellInfo) const;
-
- long top() const { return m_aRect.Top(); }
- long bottom() const { return m_aRect.Bottom(); }
- long left() const { return m_aRect.Left(); }
- long right() const { return m_aRect.Right(); }
- long width() const { return m_aRect.Width(); }
- long height() const { return m_aRect.Height(); }
- SwRect getRect() const { return m_aRect; }
- WW8TableNodeInfo * getTableNodeInfo() const
- { return m_pNodeInfo; }
- unsigned long getFmtFrmWidth() const
- {
- return m_nFmtFrmWidth;
- }
-
- void setFmtFrmWidth(unsigned long nFmtFrmWidth)
- {
- m_nFmtFrmWidth = nFmtFrmWidth;
- }
-
- ::std::string toString() const;
-};
-
}
#endif // WW8_TABLE_INFO_HXX
+
Modified: openoffice/branches/ia2/main/sw/source/filter/ww8/ww8par3.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/filter/ww8/ww8par3.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/filter/ww8/ww8par3.cxx (original)
+++ openoffice/branches/ia2/main/sw/source/filter/ww8/ww8par3.cxx Tue Apr 23 09:51:15 2013
@@ -2586,7 +2586,7 @@ static void lcl_AddToPropertyContainer
uno::Any aAny(C2U(""));
xPropContainer->addProperty
(rPropertyName,
- static_cast<sal_Int16>(beans::PropertyAttribute::BOUND ||
+ static_cast<sal_Int16>(beans::PropertyAttribute::BOUND |
beans::PropertyAttribute::REMOVABLE),
aAny);
}
Modified: openoffice/branches/ia2/main/sw/source/filter/ww8/ww8par6.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/filter/ww8/ww8par6.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/filter/ww8/ww8par6.cxx (original)
+++ openoffice/branches/ia2/main/sw/source/filter/ww8/ww8par6.cxx Tue Apr 23 09:51:15 2013
@@ -1641,8 +1641,8 @@ bool SwWW8ImplReader::SetFlyBordersShado
static void FlySecur1(short& rSize, const bool bBorder)
{
- short nMin = MINFLY +
- bBorder ? MAX_BORDER_SIZE : MAX_EMPTY_BORDER;
+ const short nMin = MINFLY +
+ (bBorder ? MAX_BORDER_SIZE : MAX_EMPTY_BORDER);
if ( rSize < nMin )
rSize = nMin;
Modified: openoffice/branches/ia2/main/sw/source/ui/app/app.src
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/app/app.src?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/ui/app/app.src (original)
+++ openoffice/branches/ia2/main/sw/source/ui/app/app.src Tue Apr 23 09:51:15 2013
@@ -107,8 +107,8 @@ SfxStyleFamilies DLG_STYLE_DESIGNER
{
SfxStyleFamilyItem
{
- Text [ en-US ] = "Paragraph Styles" ;
StyleFamily = SFX_STYLE_FAMILY_PARA ;
+ Text [ en-US ] = "Paragraph Styles" ;
FilterList [ en-US ] =
{
< "All Styles" ; SFXSTYLEBIT_ALL ; > ;
@@ -126,8 +126,8 @@ SfxStyleFamilies DLG_STYLE_DESIGNER
};
SfxStyleFamilyItem
{
- Text [ en-US ] = "Character Styles" ;
StyleFamily = SFX_STYLE_FAMILY_CHAR ;
+ Text [ en-US ] = "Character Styles" ;
FilterList [ en-US ] =
{
< "All" ; SFXSTYLEBIT_ALL ; > ;
@@ -137,8 +137,8 @@ SfxStyleFamilies DLG_STYLE_DESIGNER
};
SfxStyleFamilyItem
{
- Text [ en-US ] = "Frame Styles" ;
StyleFamily = SFX_STYLE_FAMILY_FRAME ;
+ Text [ en-US ] = "Frame Styles" ;
FilterList [ en-US ] =
{
< "All" ; SFXSTYLEBIT_ALL ; > ;
@@ -148,8 +148,8 @@ SfxStyleFamilies DLG_STYLE_DESIGNER
};
SfxStyleFamilyItem
{
- Text [ en-US ] = "Page Styles" ;
StyleFamily = SFX_STYLE_FAMILY_PAGE ;
+ Text [ en-US ] = "Page Styles" ;
FilterList [ en-US ] =
{
< "All" ; SFXSTYLEBIT_ALL ; > ;
@@ -160,13 +160,13 @@ SfxStyleFamilies DLG_STYLE_DESIGNER
SfxStyleFamilyItem
{
StyleFamily = SFX_STYLE_FAMILY_PSEUDO ;
+ Text [ en-US ] = "List Styles" ;
FilterList [ en-US ] =
{
< "All" ; SFXSTYLEBIT_ALL ; > ;
< "Applied Styles" ; SFXSTYLEBIT_USED ; > ;
< "Custom Styles" ; SFXSTYLEBIT_USERDEF ; > ;
};
- Text [ en-US ] = "List Styles" ;
};
};
Modified: openoffice/branches/ia2/main/sw/source/ui/app/appenv.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/app/appenv.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/ui/app/appenv.cxx (original)
+++ openoffice/branches/ia2/main/sw/source/ui/app/appenv.cxx Tue Apr 23 09:51:15 2013
@@ -24,11 +24,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-
-#if STLPORT_VERSION>=321
#include <cstdarg>
-#endif
-
#include <hintids.hxx>
Modified: openoffice/branches/ia2/main/sw/source/ui/app/applab.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/app/applab.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/ui/app/applab.cxx (original)
+++ openoffice/branches/ia2/main/sw/source/ui/app/applab.cxx Tue Apr 23 09:51:15 2013
@@ -24,11 +24,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-
-#if STLPORT_VERSION>=321
#include <cstdarg>
-#endif
-
#include <hintids.hxx>
Modified: openoffice/branches/ia2/main/sw/source/ui/app/docsh.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/app/docsh.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/ui/app/docsh.cxx (original)
+++ openoffice/branches/ia2/main/sw/source/ui/app/docsh.cxx Tue Apr 23 09:51:15 2013
@@ -102,6 +102,9 @@
#include <unotools/fltrcfg.hxx>
#include <svtools/htmlcfg.hxx>
#include <sfx2/fcontnr.hxx>
+//IAccessibility2 Implementation 2009-----
+#include <sfx2/viewfrm.hxx>
+//-----IAccessibility2 Implementation 2009
#include <sfx2/objface.hxx>
#include <comphelper/storagehelper.hxx>
@@ -400,6 +403,22 @@ sal_Bool SwDocShell::SaveAs( SfxMedium&
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "SW", "JP93722", "SwDocShell::SaveAs" );
+ //IAccessibility2 Implementation 2009-----
+ pDoc->setDocAccTitle(String());
+ SfxViewFrame* pFrame1 = SfxViewFrame::GetFirst( this );
+ if (pFrame1)
+ {
+ Window* pWindow = &pFrame1->GetWindow();
+ if ( pWindow )
+ {
+ Window* pSysWin = pWindow->GetSystemWindow();
+ if ( pSysWin )
+ {
+ pSysWin->SetAccessibleName(String());
+ }
+ }
+ }
+ //-----IAccessibility2 Implementation 2009
SwWait aWait( *this, sal_True );
//#i3370# remove quick help to prevent saving of autocorrection suggestions
if(pView)
@@ -1270,6 +1289,43 @@ uno::Reference< frame::XController >
/* -----------------------------12.02.01 12:08--------------------------------
---------------------------------------------------------------------------*/
+//IAccessibility2 Implementation 2009-----
+void SwDocShell::setDocAccTitle( const String& rTitle )
+{
+ if (pDoc )
+ {
+ pDoc->setDocAccTitle( rTitle );
+ }
+}
+const String SwDocShell::getDocAccTitle() const
+{
+ String sRet;
+ if (pDoc)
+ {
+ sRet = pDoc->getDocAccTitle();
+ }
+
+ return sRet;
+}
+
+void SwDocShell::setDocReadOnly( sal_Bool bReadOnly)
+{
+ if (pDoc )
+ {
+ pDoc->setDocReadOnly( bReadOnly );
+ }
+}
+sal_Bool SwDocShell::getDocReadOnly() const
+{
+ if (pDoc)
+ {
+ return pDoc->getDocReadOnly();
+ }
+
+ return sal_False;
+}
+//-----IAccessibility2 Implementation 2009
+
static const char* s_EventNames[] =
{
"OnPageCountChange",
Modified: openoffice/branches/ia2/main/sw/source/ui/app/docsh2.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/app/docsh2.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/ui/app/docsh2.cxx (original)
+++ openoffice/branches/ia2/main/sw/source/ui/app/docsh2.cxx Tue Apr 23 09:51:15 2013
@@ -1019,7 +1019,7 @@ void SwDocShell::Execute(SfxRequest& rRe
case SID_GET_COLORTABLE:
{
SvxColorTableItem* pColItem = (SvxColorTableItem*)GetItem(SID_COLOR_TABLE);
- XColorTable* pTable = pColItem->GetColorTable();
+ XColorList* pTable = pColItem->GetColorTable();
rReq.SetReturnValue(OfaPtrItem(SID_GET_COLORTABLE, pTable));
}
break;
Modified: openoffice/branches/ia2/main/sw/source/ui/app/docshdrw.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/app/docshdrw.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/ui/app/docshdrw.cxx (original)
+++ openoffice/branches/ia2/main/sw/source/ui/app/docshdrw.cxx Tue Apr 23 09:51:15 2013
@@ -73,7 +73,7 @@ void SwDocShell::InitDraw()
rOutliner.SetHyphenator( xHyphenator );
}
else
- PutItem( SvxColorTableItem( XColorTable::GetStdColorTable(), SID_COLOR_TABLE ));
+ PutItem( SvxColorTableItem( XColorList::GetStdColorList(), SID_COLOR_TABLE ));
}
Modified: openoffice/branches/ia2/main/sw/source/ui/app/docshini.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/app/docshini.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/ui/app/docshini.cxx (original)
+++ openoffice/branches/ia2/main/sw/source/ui/app/docshini.cxx Tue Apr 23 09:51:15 2013
@@ -439,9 +439,9 @@ SwDocShell::SwDocShell( SwDoc *pD, SfxOb
// wird nur die DocInfo fuer den Explorer gelesen, ist das Item nicht da
if(pColItem)
{
- XColorTable* pTable = pColItem->GetColorTable();
+ XColorList* pTable = pColItem->GetColorTable();
// wurde eine neue Table angelegt, muss sie auch geloescht werden.
- if((void*)pTable != (void*)(XColorTable::GetStdColorTable()) )
+ if((void*)pTable != (void*)(XColorList::GetStdColorList()) )
delete pTable;
}
Modified: openoffice/branches/ia2/main/sw/source/ui/app/docst.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/app/docst.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/ui/app/docst.cxx (original)
+++ openoffice/branches/ia2/main/sw/source/ui/app/docst.cxx Tue Apr 23 09:51:15 2013
@@ -283,7 +283,7 @@ void SwDocShell::ExecStyleSheet( SfxRequ
if( pArgs && SFX_ITEM_SET == pArgs->GetItemState( SID_STYLE_FAMILY,
sal_False, &pItem ))
{
- sal_uInt16 nFamily = ((const SfxUInt16Item*)pItem)->GetValue();
+ const sal_uInt16 nFamily = ((const SfxUInt16Item*)pItem)->GetValue();
String sName;
sal_uInt16 nMask = 0;
@@ -298,7 +298,7 @@ void SwDocShell::ExecStyleSheet( SfxRequ
sal_False, &pItem ))
sParent = ((const SfxStringItem*)pItem)->GetValue();
- nRet = Edit( sName, sParent, nFamily, nMask, sal_True, sal_False, 0, rReq.IsAPI() );
+ nRet = Edit( sName, sParent, nFamily, nMask, sal_True, 0, 0, rReq.IsAPI() );
}
break;
@@ -458,7 +458,7 @@ void SwDocShell::ExecStyleSheet( SfxRequ
switch(nSlot)
{
case SID_STYLE_EDIT:
- nRet = Edit(aParam, aEmptyStr, nFamily, nMask, sal_False, sal_False, pActShell );
+ nRet = Edit(aParam, aEmptyStr, nFamily, nMask, sal_False, 0, pActShell );
break;
case SID_STYLE_DELETE:
nRet = Delete(aParam, nFamily);
@@ -509,9 +509,15 @@ void SwDocShell::ExecStyleSheet( SfxRequ
--------------------------------------------------------------------*/
-sal_uInt16 SwDocShell::Edit( const String &rName, const String &rParent, sal_uInt16 nFamily, sal_uInt16 nMask,
- sal_Bool bNew, sal_Bool bColumn, SwWrtShell* pActShell,
- sal_Bool bBasic )
+sal_uInt16 SwDocShell::Edit(
+ const String &rName,
+ const String &rParent,
+ const sal_uInt16 nFamily,
+ sal_uInt16 nMask,
+ const sal_Bool bNew,
+ const sal_uInt16 nSlot,
+ SwWrtShell* pActShell,
+ const sal_Bool bBasic )
{
ASSERT(GetWrtShell(), "Keine Shell, keine Styles");
SfxStyleSheetBase *pStyle = 0;
@@ -671,14 +677,14 @@ sal_uInt16 SwDocShell::Edit( const Strin
!pCurrShell->getIDocumentDeviceAccess()->getPrinter( false ) )
pCurrShell->InitPrt( pCurrShell->getIDocumentDeviceAccess()->getPrinter( true ) );
- PutItem(SfxUInt16Item(SID_HTML_MODE, nHtmlMode));
- FieldUnit eMetric = ::GetDfltMetric(0 != (HTMLMODE_ON&nHtmlMode));
+ PutItem(SfxUInt16Item(SID_HTML_MODE, nHtmlMode));
+ FieldUnit eMetric = ::GetDfltMetric(0 != (HTMLMODE_ON&nHtmlMode));
SW_MOD()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< sal_uInt16 >(eMetric)));
- SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
+ SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "Dialogdiet fail!");
SfxAbstractTabDialog* pDlg = pFact->CreateTemplateDialog( DLG_TEMPLATE_BASE,
- 0, *(xTmp.get()), nFamily, bColumn,
- pActShell ? pActShell : pWrtShell, bNew);
+ 0, *(xTmp.get()), nFamily, nSlot,
+ pActShell ? pActShell : pWrtShell, bNew);
DBG_ASSERT(pDlg, "Dialogdiet fail!");
if(RET_OK == pDlg->Execute())
{
@@ -1286,9 +1292,12 @@ void SwDocShell::_LoadStyles( SfxObjectS
}
-void SwDocShell::FormatPage( const String& rPage, sal_Bool bColumn, SwWrtShell* pActShell )
+void SwDocShell::FormatPage(
+ const String& rPage,
+ const sal_uInt16 nSlot,
+ SwWrtShell& rActShell )
{
- Edit( rPage, aEmptyStr, SFX_STYLE_FAMILY_PAGE, 0, sal_False, bColumn, pActShell);
+ Edit( rPage, aEmptyStr, SFX_STYLE_FAMILY_PAGE, 0, sal_False, nSlot, &rActShell);
}
Bitmap SwDocShell::GetStyleFamilyBitmap( SfxStyleFamily eFamily, BmpColorMode eColorMode )
Modified: openoffice/branches/ia2/main/sw/source/ui/app/mn.src
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/app/mn.src?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/ui/app/mn.src (original)
+++ openoffice/branches/ia2/main/sw/source/ui/app/mn.src Tue Apr 23 09:51:15 2013
@@ -430,20 +430,20 @@ location: <project>/uiconfig/[swriter|sw
SEPARATOR ; \
MenuItem\
{\
- Identifier = FN_TABLE_VERT_NONE ; \
- HelpId = CMD_FN_TABLE_VERT_NONE ; \
+ Identifier = SID_TABLE_VERT_NONE ; \
+ HelpId = CMD_SID_TABLE_VERT_NONE ; \
Text [ en-US ] = "~Top" ; \
};\
MenuItem\
{\
- Identifier = FN_TABLE_VERT_CENTER ; \
- HelpId = CMD_FN_TABLE_VERT_CENTER ; \
+ Identifier = SID_TABLE_VERT_CENTER ; \
+ HelpId = CMD_SID_TABLE_VERT_CENTER ; \
Text [ en-US ] = "C~enter" ; \
};\
MenuItem\
{\
- Identifier = FN_TABLE_VERT_BOTTOM ; \
- HelpId = CMD_FN_TABLE_VERT_BOTTOM ; \
+ Identifier = SID_TABLE_VERT_BOTTOM ; \
+ HelpId = CMD_SID_TABLE_VERT_BOTTOM ; \
Text [ en-US ] = "~Bottom" ; \
};\
SEPARATOR ; \
Modified: openoffice/branches/ia2/main/sw/source/ui/app/swmodule.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/app/swmodule.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/ui/app/swmodule.cxx (original)
+++ openoffice/branches/ia2/main/sw/source/ui/app/swmodule.cxx Tue Apr 23 09:51:15 2013
@@ -134,6 +134,7 @@
#include <mailmergechildwindow.hxx>
#include <modcfg.hxx>
#include <fontcfg.hxx>
+#include <sfx2/sidebar/SidebarChildWindow.hxx>
#include <sfx2/taskpane.hxx>
#include <sfx2/evntconf.hxx>
#include <sfx2/appuno.hxx>
@@ -464,7 +465,8 @@ void SwDLL::RegisterControls()
::avmedia::MediaPlayer::RegisterChildWindow(0, pMod);
SvxSmartTagsControl::RegisterControl(SID_OPEN_SMARTTAGMENU, pMod);
- ::sfx2::TaskPaneWrapper::RegisterChildWindow( sal_False, pMod );
+ ::sfx2::sidebar::SidebarChildWindow::RegisterChildWindow(NULL, pMod);
+ ::sfx2::TaskPaneWrapper::RegisterChildWindow(NULL, pMod);
}
Modified: openoffice/branches/ia2/main/sw/source/ui/cctrl/actctrl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/cctrl/actctrl.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/ui/cctrl/actctrl.cxx (original)
+++ openoffice/branches/ia2/main/sw/source/ui/cctrl/actctrl.cxx Tue Apr 23 09:51:15 2013
@@ -105,8 +105,13 @@ void NoSpaceEdit::Modify()
SetText(sTemp);
SetSelection(aSel);
}
+//IAccessibility2 Impplementaton 2009-----
+ Edit::Modify();
+ /*
if(GetModifyHdl().IsSet())
GetModifyHdl().Call(this);
+ */
+//-----IAccessibility2 Impplementaton 2009
}
/* -----------------25.06.2003 15:57-----------------
Modified: openoffice/branches/ia2/main/sw/source/ui/cctrl/swlbox.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/cctrl/swlbox.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/ui/cctrl/swlbox.cxx (original)
+++ openoffice/branches/ia2/main/sw/source/ui/cctrl/swlbox.cxx Tue Apr 23 09:51:15 2013
@@ -223,5 +223,11 @@ String SwComboBox::GetText() const
return aTxt;
}
-
-
+//IAccessibility2 Impplementaton 2009-----
+void SwComboBox::SetText( const XubString& rStr )
+{
+ ComboBox::SetText(rStr);
+ // MT: CallEventListeners stay protected for now. Probably not needed at all, as the implementation of VCLXAccessibelEdit/ComboBox should do it on text changed nowadays anyway. Verify.
+ // CallEventListeners( VCLEVENT_EDIT_MODIFY );
+}
+//-----IAccessibility2 Impplementaton 2009
Modified: openoffice/branches/ia2/main/sw/source/ui/chrdlg/swuiccoll.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/chrdlg/swuiccoll.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/ui/chrdlg/swuiccoll.cxx (original)
+++ openoffice/branches/ia2/main/sw/source/ui/chrdlg/swuiccoll.cxx Tue Apr 23 09:51:15 2013
@@ -127,12 +127,17 @@ SwCondCollPage::SwCondCollPage(Window *p
break;
}
- const SfxStyleFilter& rFilterList = pFamilyItem->GetFilterList();
- for( i = 0; i < rFilterList.Count(); ++i)
+//IAccessibility2 Impplementaton 2009-----
+ if( pFamilyItem )
{
- aFilterLB.InsertEntry(rFilterList.GetObject(i)->aName);
- sal_uInt16* pFilter = new sal_uInt16(rFilterList.GetObject(i)->nFlags);
- aFilterLB.SetEntryData(i, pFilter);
+ const SfxStyleFilter& rFilterList = pFamilyItem->GetFilterList();
+ for( i = 0; i < rFilterList.Count(); ++i)
+ {
+ aFilterLB.InsertEntry(rFilterList.GetObject(i)->aName);
+ sal_uInt16* pFilter = new sal_uInt16(rFilterList.GetObject(i)->nFlags);
+ aFilterLB.SetEntryData(i, pFilter);
+ }
+//-----IAccessibility2 Impplementaton 2009
}
aFilterLB.SelectEntryPos(1);
Modified: openoffice/branches/ia2/main/sw/source/ui/config/optdlg.src
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/config/optdlg.src?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/ui/config/optdlg.src (original)
+++ openoffice/branches/ia2/main/sw/source/ui/config/optdlg.src Tue Apr 23 09:51:15 2013
@@ -342,7 +342,6 @@ TabPage TP_OPTPRINT_PAGE
Pos = MAP_APPFONT ( 103 , 53 ) ;
Size = MAP_APPFONT ( 70 , 10 ) ;
Text [ en-US ] = "Right to Left" ;
- Text [ x-comment ] = " ";
};
RadioButton RB_NO
{
Modified: openoffice/branches/ia2/main/sw/source/ui/config/optload.src
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/config/optload.src?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/ui/config/optload.src (original)
+++ openoffice/branches/ia2/main/sw/source/ui/config/optload.src Tue Apr 23 09:51:15 2013
@@ -141,7 +141,6 @@ TabPage TP_OPTLOAD_PAGE
Pos = MAP_APPFONT ( 12 , 111) ;
Size = MAP_APPFONT ( 248 , 10 ) ;
Text [ en-US ] = "Use square page mode for text grid";
- Text [ zh-CN ] = "使ç¨ç¨¿çº¸æ¨¡å¼";
};
};
/**************************************************************************/
Modified: openoffice/branches/ia2/main/sw/source/ui/config/optpage.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/config/optpage.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/ui/config/optpage.cxx (original)
+++ openoffice/branches/ia2/main/sw/source/ui/config/optpage.cxx Tue Apr 23 09:51:15 2013
@@ -2133,7 +2133,7 @@ void SwRedlineOptionsTabPage::Reset( con
aDeletedColorLB.InsertEntry(sAuthor);
aChangedColorLB.InsertEntry(sAuthor);
- XColorTable* pColorTbl = XColorTable::GetStdColorTable();
+ XColorList* pColorTbl = XColorList::GetStdColorList();
sal_uInt16 i;
for( i = 0; i < pColorTbl->Count(); ++i )
{
Modified: openoffice/branches/ia2/main/sw/source/ui/dbui/dbmgr.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/dbui/dbmgr.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/ui/dbui/dbmgr.cxx (original)
+++ openoffice/branches/ia2/main/sw/source/ui/dbui/dbmgr.cxx Tue Apr 23 09:51:15 2013
@@ -23,11 +23,10 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-#if STLPORT_VERSION>=321
+
#include <cstdarg>
-#endif
+#include <cstdio>
-#include <stdio.h>
#include <unotxdoc.hxx>
#include <com/sun/star/text/NotePrintMode.hpp>
#include <sfx2/app.hxx>
Modified: openoffice/branches/ia2/main/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx (original)
+++ openoffice/branches/ia2/main/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx Tue Apr 23 09:51:15 2013
@@ -251,7 +251,7 @@ svx::SpellPortions SwSpellDialogChildWin
{
m_pSpellState->pOtherCursor = new SwPaM(*pWrtShell->GetCrsr()->GetPoint());
m_pSpellState->m_bStartedInOther = true;
- pWrtShell->SpellStart( DOCPOS_OTHERSTART, DOCPOS_OTHEREND, DOCPOS_CURR, sal_False );
+ pWrtShell->SpellStart( DOCPOS_OTHERSTART, DOCPOS_OTHEREND, DOCPOS_CURR, NULL );
}
else
{
@@ -264,7 +264,7 @@ svx::SpellPortions SwSpellDialogChildWin
*pWrtShell->GetDoc(),
*pCrsr->Start(), pCrsr->End());
}
- pWrtShell->SpellStart( DOCPOS_START, DOCPOS_END, DOCPOS_CURR, sal_False );
+ pWrtShell->SpellStart( DOCPOS_START, DOCPOS_END, DOCPOS_CURR, NULL );
}
}
else
@@ -309,7 +309,7 @@ The code below would only be part of the
//if there's any that has not been spelled yet
if(!m_pSpellState->m_bOtherSpelled && pWrtShell->HasOtherCnt())
{
- pWrtShell->SpellStart(DOCPOS_OTHERSTART, DOCPOS_OTHEREND, DOCPOS_OTHERSTART, sal_False );
+ pWrtShell->SpellStart(DOCPOS_OTHERSTART, DOCPOS_OTHEREND, DOCPOS_OTHERSTART, NULL );
if(!pWrtShell->SpellSentence(aRet, m_bIsGrammarCheckingOn))
{
pWrtShell->SpellEnd();
@@ -321,7 +321,7 @@ The code below would only be part of the
//if no result has been found try at the body text - completely
if(!m_pSpellState->m_bBodySpelled && !aRet.size())
{
- pWrtShell->SpellStart(DOCPOS_START, DOCPOS_END, DOCPOS_START, sal_False );
+ pWrtShell->SpellStart(DOCPOS_START, DOCPOS_END, DOCPOS_START, NULL );
if(!pWrtShell->SpellSentence(aRet, m_bIsGrammarCheckingOn))
{
m_pSpellState->m_bBodySpelled = true;
@@ -350,7 +350,7 @@ The code below would only be part of the
pWrtShell->SpellEnd();
delete m_pSpellState->pOtherCursor;
m_pSpellState->pOtherCursor = 0;
- pWrtShell->SpellStart(DOCPOS_OTHERSTART, DOCPOS_CURR, DOCPOS_OTHERSTART, sal_False );
+ pWrtShell->SpellStart(DOCPOS_OTHERSTART, DOCPOS_CURR, DOCPOS_OTHERSTART, NULL );
pWrtShell->SpellSentence(aRet, m_bIsGrammarCheckingOn);
}
if(!aRet.size())
@@ -363,7 +363,7 @@ The code below would only be part of the
//has the body been spelled?
if(!m_pSpellState->m_bBodySpelled)
{
- pWrtShell->SpellStart(DOCPOS_START, DOCPOS_END, DOCPOS_START, sal_False );
+ pWrtShell->SpellStart(DOCPOS_START, DOCPOS_END, DOCPOS_START, NULL );
if(!pWrtShell->SpellSentence(aRet, m_bIsGrammarCheckingOn))
{
m_pSpellState->m_bBodySpelled = true;
@@ -376,7 +376,7 @@ The code below would only be part of the
m_pSpellState->m_bBodySpelled = true;
if(!m_pSpellState->m_bOtherSpelled && pWrtShell->HasOtherCnt())
{
- pWrtShell->SpellStart(DOCPOS_OTHERSTART, DOCPOS_OTHEREND, DOCPOS_OTHERSTART, sal_False );
+ pWrtShell->SpellStart(DOCPOS_OTHERSTART, DOCPOS_OTHEREND, DOCPOS_OTHERSTART, NULL );
if(!pWrtShell->SpellSentence(aRet, m_bIsGrammarCheckingOn))
{
pWrtShell->SpellEnd();
Modified: openoffice/branches/ia2/main/sw/source/ui/dialog/swdlgfact.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/dialog/swdlgfact.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/ui/dialog/swdlgfact.cxx (original)
+++ openoffice/branches/ia2/main/sw/source/ui/dialog/swdlgfact.cxx Tue Apr 23 09:51:15 2013
@@ -1295,7 +1295,7 @@ SfxAbstractTabDialog* SwAbstractDialogFa
Window* pParent,
SfxStyleSheetBase& rBase,
sal_uInt16 nRegion,
- sal_Bool bColumn,
+ const sal_uInt16 nSlot,
SwWrtShell* pActShell,
sal_Bool bNew ) //add for SwTemplateDlg
{
@@ -1303,7 +1303,7 @@ SfxAbstractTabDialog* SwAbstractDialogFa
switch ( nResId )
{
case DLG_TEMPLATE_BASE :
- pDlg = new SwTemplateDlg( pParent, rBase, nRegion, bColumn, pActShell, bNew );
+ pDlg = new SwTemplateDlg( pParent, rBase, nRegion, nSlot, pActShell, bNew );
break;
default:
break;
Modified: openoffice/branches/ia2/main/sw/source/ui/dialog/swdlgfact.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/dialog/swdlgfact.hxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/ui/dialog/swdlgfact.hxx (original)
+++ openoffice/branches/ia2/main/sw/source/ui/dialog/swdlgfact.hxx Tue Apr 23 09:51:15 2013
@@ -498,14 +498,14 @@ public:
sal_Bool bFmt = sal_False,
sal_uInt16 nDefPage = 0,
const String* pFmtStr = 0); //add for SwFrmDlg
- virtual SfxAbstractTabDialog* CreateTemplateDialog( int nResId,
- Window* pParent,
- SfxStyleSheetBase& rBase,
- sal_uInt16 nRegion,
- sal_Bool bColumn = sal_False,
- SwWrtShell* pActShell = 0,
- sal_Bool bNew = sal_False ); //add for SwTemplateDlg
- virtual AbstractGlossaryDlg* CreateGlossaryDlg( int nResId,
+ virtual SfxAbstractTabDialog* CreateTemplateDialog( int nResId,
+ Window* pParent,
+ SfxStyleSheetBase& rBase,
+ sal_uInt16 nRegion,
+ const sal_uInt16 nSlot = 0,
+ SwWrtShell* pActShell = 0,
+ sal_Bool bNew = sal_False ); //add for SwTemplateDlg
+ virtual AbstractGlossaryDlg* CreateGlossaryDlg( int nResId,
SfxViewFrame* pViewFrame,
SwGlossaryHdl* pGlosHdl,
SwWrtShell *pWrtShell); //add for SwGlossaryDlg
Modified: openoffice/branches/ia2/main/sw/source/ui/dialog/uiregionsw.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/dialog/uiregionsw.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/ui/dialog/uiregionsw.cxx (original)
+++ openoffice/branches/ia2/main/sw/source/ui/dialog/uiregionsw.cxx Tue Apr 23 09:51:15 2013
@@ -457,6 +457,9 @@ SwEditRegionDlg::SwEditRegionDlg( Window
aPasswdPB.SetAccessibleRelationMemberOf(&aProtectFL);
aPasswdPB.SetAccessibleRelationLabeledBy(&aPasswdCB);
aSubRegionED.SetAccessibleName(aSubRegionFT.GetText());
+//IAccessibility2 Impplementaton 2009-----
+ aTree.SetAllEntriesAccessibleRoleType(TREEBOX_ALLITEM_ACCROLE_TYPE_TREE);
+//-----IAccessibility2 Impplementaton 2009
}
/* -----------------------------26.04.01 14:56--------------------------------
Modified: openoffice/branches/ia2/main/sw/source/ui/docvw/edtwin.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/docvw/edtwin.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/ui/docvw/edtwin.cxx (original)
+++ openoffice/branches/ia2/main/sw/source/ui/docvw/edtwin.cxx Tue Apr 23 09:51:15 2013
@@ -5863,3 +5863,17 @@ Selection SwEditWin::GetSurroundingTextS
return Selection( nPos - nStartPos, nPos - nStartPos );
}
}
+//IAccessibility2 Implementation 2009-----
+// MT: Removed Windows::SwitchView() introduced with IA2 CWS.
+// There are other notifications for this when the active view has chnaged, so please update the code to use that event mechanism
+void SwEditWin::SwitchView()
+{
+#ifdef ACCESSIBLE_LAYOUT
+ if (!Application::IsAccessibilityEnabled())
+ {
+ return ;
+ }
+ rView.GetWrtShell().InvalidateAccessibleFocus();
+#endif
+}
+//-----IAccessibility2 Implementation 2009
Modified: openoffice/branches/ia2/main/sw/source/ui/docvw/edtwin3.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/docvw/edtwin3.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/ui/docvw/edtwin3.cxx (original)
+++ openoffice/branches/ia2/main/sw/source/ui/docvw/edtwin3.cxx Tue Apr 23 09:51:15 2013
@@ -142,6 +142,34 @@ sal_Bool SwEditWin::RulerMarginDrag( con
return !rRuler.StartDocDrag( rMEvt, RULER_TYPE_INDENT);
}
// <--
+//IAccessibility2 Impplementaton 2009-----
+void AccessibilityScrollMDI(ViewShell* pVwSh, const SwRect& rRect , sal_uInt16 nRangeX, sal_uInt16 nRangeY, sal_Bool isLeftTop)
+{
+ SfxViewShell *pSfxVwSh = pVwSh->GetSfxViewShell();
+ if (pSfxVwSh && pSfxVwSh->ISA(SwView))
+ {
+ SwView* pView = (SwView *)pSfxVwSh;
+
+ Size aSz( rRect.Left(), rRect.Top());
+ aSz = pView->GetEditWin().PixelToLogic( aSz );
+
+ Point aTopLeft( aSz.Width(), aSz.Height() );
+ Point aPoint;
+ Rectangle aRect(aTopLeft,aPoint);
+
+ sal_Bool bIsCrsrAtTop = pView->IsCrsrAtTop();
+ sal_Bool bIsCrsrAtCenter = pView->IsCrsrAtCenter();
+ if(isLeftTop)
+ pView->SetCrsrAtTop(sal_True);
+
+ pView->Scroll( aRect, nRangeX, nRangeY );
+
+ if(isLeftTop)
+ pView->SetCrsrAtTop(bIsCrsrAtTop, bIsCrsrAtCenter);
+ }
+
+}
+//-----IAccessibility2 Impplementaton 2009
LAYOUT_NS Dialog* GetSearchDialog()
{
Modified: openoffice/branches/ia2/main/sw/source/ui/fmtui/tmpdlg.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/fmtui/tmpdlg.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/ui/fmtui/tmpdlg.cxx (original)
+++ openoffice/branches/ia2/main/sw/source/ui/fmtui/tmpdlg.cxx Tue Apr 23 09:51:15 2013
@@ -106,7 +106,7 @@ extern SW_DLLPUBLIC SwWrtShell* GetActiv
SwTemplateDlg::SwTemplateDlg(Window* pParent,
SfxStyleSheetBase& rBase,
sal_uInt16 nRegion,
- sal_Bool bColumn,
+ const sal_uInt16 nSlot,
SwWrtShell* pActShell,
sal_Bool bNew ) :
SfxStyleDialog( pParent,
@@ -260,15 +260,6 @@ SwTemplateDlg::SwTemplateDlg(Window* p
AddTabPage( TP_MACRO_ASSIGN, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_MACROASSIGN), 0);
- // Auskommentiert wegen Bug #45776 (per default keine Breite&Groesse in Rahmenvorlagen)
-/* SwFmtFrmSize aSize( (const SwFmtFrmSize&)rBase.
- GetItemSet().Get(RES_FRM_SIZE));
- if( !aSize.GetWidth() )
- {
- aSize.SetWidth( DFLT_WIDTH );
- aSize.SetHeight( DFLT_HEIGHT );
- rBase.GetItemSet().Put( aSize );
- }*/
break;
}
// Seitenvorlagen
@@ -277,34 +268,40 @@ SwTemplateDlg::SwTemplateDlg(Window* p
DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageCreatorFunc fail!");
DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageRangesFunc fail!");
AddTabPage(TP_BACKGROUND, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ) );
- AddTabPage(TP_HEADER_PAGE, String(SW_RES(STR_PAGE_HEADER)),
- SvxHeaderPage::Create,
- SvxHeaderPage::GetRanges );
- AddTabPage(TP_FOOTER_PAGE, String(SW_RES(STR_PAGE_FOOTER)),
- SvxFooterPage::Create,
- SvxFooterPage::GetRanges );
- if(bColumn)
- SetCurPageId(TP_COLUMN);
+ AddTabPage(TP_HEADER_PAGE, String(SW_RES(STR_PAGE_HEADER)),
+ SvxHeaderPage::Create,
+ SvxHeaderPage::GetRanges );
+ AddTabPage(TP_FOOTER_PAGE, String(SW_RES(STR_PAGE_FOOTER)),
+ SvxFooterPage::Create,
+ SvxFooterPage::GetRanges );
+ if ( nSlot == FN_FORMAT_PAGE_COLUMN_DLG )
+ {
+ SetCurPageId(TP_COLUMN);
+ }
+ else if ( nSlot == FN_FORMAT_PAGE_SETTING_DLG )
+ {
+ SetCurPageId(TP_PAGE_STD);
+ }
DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PAGE ), "GetTabPageCreatorFunc fail!");
DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_PAGE ), "GetTabPageRangesFunc fail!");
- AddTabPage(TP_PAGE_STD, String(SW_RES(STR_PAGE_STD)),
+ AddTabPage(TP_PAGE_STD, String(SW_RES(STR_PAGE_STD)),
pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PAGE ),
pFact->GetTabPageRangesFunc( RID_SVXPAGE_PAGE ),
- sal_False,
- 1 ); // nach der Verwalten-Page
- if(!pActShell || 0 == ::GetHtmlMode(pWrtShell->GetView().GetDocShell()))
- {
+ sal_False,
+ 1 ); // nach der Verwalten-Page
+ if(!pActShell || 0 == ::GetHtmlMode(pWrtShell->GetView().GetDocShell()))
+ {
DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), "GetTabPageCreatorFunc fail!");
DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ), "GetTabPageRangesFunc fail!");
- AddTabPage(TP_BORDER, String(SW_RES(STR_PAGE_BORDER)),
- pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ) );
- AddTabPage(TP_COLUMN, String(SW_RES(STR_PAGE_COLUMN)),
- SwColumnPage::Create,
- SwColumnPage::GetRanges );
- AddTabPage(TP_FOOTNOTE_PAGE, String(SW_RES(STR_PAGE_FOOTNOTE)),
- SwFootNotePage::Create,
- SwFootNotePage::GetRanges );
+ AddTabPage(TP_BORDER, String(SW_RES(STR_PAGE_BORDER)),
+ pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ) );
+ AddTabPage(TP_COLUMN, String(SW_RES(STR_PAGE_COLUMN)),
+ SwColumnPage::Create,
+ SwColumnPage::GetRanges );
+ AddTabPage(TP_FOOTNOTE_PAGE, String(SW_RES(STR_PAGE_FOOTNOTE)),
+ SwFootNotePage::Create,
+ SwFootNotePage::GetRanges );
AddTabPage(TP_TEXTGRID_PAGE, String(SW_RES(STR_PAGE_TEXTGRID)),
SwTextGridPage::Create,
SwTextGridPage::GetRanges );
@@ -314,9 +311,9 @@ SwTemplateDlg::SwTemplateDlg(Window* p
}
- }
- break;
- // Numerierungsvorlagen
+ }
+ break;
+ // Numerierungsvorlagen
case SFX_STYLE_FAMILY_PSEUDO:
{
AddTabPage( RID_SVXPAGE_PICK_SINGLE_NUM );
Modified: openoffice/branches/ia2/main/sw/source/ui/frmdlg/column.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/frmdlg/column.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/ui/frmdlg/column.cxx (original)
+++ openoffice/branches/ia2/main/sw/source/ui/frmdlg/column.cxx Tue Apr 23 09:51:15 2013
@@ -517,8 +517,35 @@ SwColumnPage::SwColumnPage(Window *pPare
| WB_ITEMBORDER
| WB_DOUBLEBORDER );
+//IAccessibility2 Impplementaton 2009-----
for( i = 0; i < 5; i++)
- aDefaultVS.InsertItem( i + 1, i );
+ //Solution:Set accessible name one be one
+ //aDefaultVS.InsertItem( i + 1, i );
+ {
+ String aItemText;
+ switch( i )
+ {
+ case 0:
+ aItemText = SW_RESSTR( STR_COLUMN_VALUESET_ITEM0 ) ;
+ break;
+ case 1:
+ aItemText = SW_RESSTR( STR_COLUMN_VALUESET_ITEM1 ) ;
+ break;
+ case 2:
+ aItemText = SW_RESSTR( STR_COLUMN_VALUESET_ITEM2 ) ;
+ break;
+ case 3:
+ aItemText = SW_RESSTR( STR_COLUMN_VALUESET_ITEM3 );
+ break;
+ case 4:
+ aItemText = SW_RESSTR( STR_COLUMN_VALUESET_ITEM4 );
+ break;
+ default:
+ break;
+ }
+ aDefaultVS.InsertItem( i + 1, aItemText, i );
+ }
+//-----IAccessibility2 Impplementaton 2009
aDefaultVS.SetSelectHdl(LINK(this, SwColumnPage, SetDefaultsHdl));
@@ -968,7 +995,14 @@ IMPL_LINK( SwColumnPage, ColModify, Nume
// #i17816# changing the displayed types within the ValueSet
//from two columns to two columns with different settings doesn't invalidate the
// example windows in ::ColModify()
- if(!pNF ||(pColMgr->GetCount() != nCols))
+//IAccessibility2 Impplementaton 2009-----
+// the pColMgr->GetCount()'s return is some how bugged,
+// it will return 0 when actual count is 1, so fix it.
+ //if(!pNF ||(pColMgr->GetCount() != nCols))
+ int nTemp = pColMgr->GetCount();
+ if(nTemp == 0) nTemp = 1;
+ if( nTemp != nCols )
+//-----IAccessibility2 Impplementaton 2009
{
if(pNF)
aDefaultVS.SetNoSelection();
Modified: openoffice/branches/ia2/main/sw/source/ui/frmdlg/column.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/frmdlg/column.hrc?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/ui/frmdlg/column.hrc (original)
+++ openoffice/branches/ia2/main/sw/source/ui/frmdlg/column.hrc Tue Apr 23 09:51:15 2013
@@ -75,8 +75,15 @@
#define FT_TEXTDIRECTION 60
#define LB_TEXTDIRECTION 61
#define FL_VERT 62
+//IAccessibility2 Impplementaton 2009-----
+#define STR_PAGESETUP_SPACING 32765
+//-----IAccessibility2 Impplementaton 2009
#define LISTBOX_SELECTION 0
#define LISTBOX_SECTION 1
#define LISTBOX_SECTIONS 2
#define LISTBOX_PAGE 3
#define LISTBOX_FRAME 4
+
+//IAccessibility2 Impplementaton 2009-----
+#define STR_COLUMN_WIDTH 63
+//-----IAccessibility2 Impplementaton 2009
Modified: openoffice/branches/ia2/main/sw/source/ui/frmdlg/frmpage.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/frmdlg/frmpage.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/ui/frmdlg/frmpage.cxx (original)
+++ openoffice/branches/ia2/main/sw/source/ui/frmdlg/frmpage.cxx Tue Apr 23 09:51:15 2013
@@ -639,11 +639,15 @@ sal_uLong lcl_GetLBRelationsForStrID( co
namespace
{
- void HandleAutoCB( sal_Bool _bChecked, FixedText& _rFT_man, FixedText& _rFT_auto )
+ //IAccessibility2 Implementation 2009-----
+ void HandleAutoCB( sal_Bool _bChecked, FixedText& _rFT_man, FixedText& _rFT_auto, PercentField& _rPF_Edit)
{
_rFT_man.Show( !_bChecked );
_rFT_auto.Show( _bChecked );
+ String accName = _bChecked ? _rFT_auto.GetText() : _rFT_man.GetText();
+ _rPF_Edit.SetAccessibleName(accName);
}
+ //-----IAccessibility2 Implementation 2009
}
@@ -2091,14 +2095,18 @@ IMPL_LINK_INLINE_END( SwFrmPage, RealSiz
IMPL_LINK( SwFrmPage, AutoWidthClickHdl, void*, EMPTYARG )
{
if( !IsInGraficMode() )
- HandleAutoCB( aAutoWidthCB.IsChecked(), aWidthFT, aWidthAutoFT );
+ //IAccessibility2 Implementation 2009-----
+ HandleAutoCB( aAutoWidthCB.IsChecked(), aWidthFT, aWidthAutoFT, aWidthED );
+ //-----IAccessibility2 Implementation 2009
return 0;
}
IMPL_LINK( SwFrmPage, AutoHeightClickHdl, void*, EMPTYARG )
{
if( !IsInGraficMode() )
- HandleAutoCB( aAutoHeightCB.IsChecked(), aHeightFT, aHeightAutoFT );
+ //IAccessibility2 Implementation 2009-----
+ HandleAutoCB( aAutoHeightCB.IsChecked(), aHeightFT, aHeightAutoFT, aWidthED );
+ //-----IAccessibility2 Implementation 2009
return 0;
}
@@ -2247,14 +2255,18 @@ void SwFrmPage::Init(const SfxItemSet& r
SwFrmSize eSize = rSize.GetHeightSizeType();
sal_Bool bCheck = eSize != ATT_FIX_SIZE;
aAutoHeightCB.Check( bCheck );
- HandleAutoCB( bCheck, aHeightFT, aHeightAutoFT );
+ //IAccessibility2 Implementation 2009-----
+ HandleAutoCB( bCheck, aHeightFT, aHeightAutoFT, aWidthED );
+ //-----IAccessibility2 Implementation 2009
if( eSize == ATT_VAR_SIZE )
aHeightED.SetValue( aHeightED.GetMin(), FUNIT_NONE );
eSize = rSize.GetWidthSizeType();
bCheck = eSize != ATT_FIX_SIZE;
aAutoWidthCB.Check( bCheck );
- HandleAutoCB( bCheck, aWidthFT, aWidthAutoFT );
+ //IAccessibility2 Implementation 2009-----
+ HandleAutoCB( bCheck, aWidthFT, aWidthAutoFT, aWidthED );
+ //-----IAccessibility2 Implementation 2009
if( eSize == ATT_VAR_SIZE )
aWidthED.SetValue( aWidthED.GetMin(), FUNIT_NONE );
Modified: openoffice/branches/ia2/main/sw/source/ui/inc/conttree.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/inc/conttree.hxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/ui/inc/conttree.hxx (original)
+++ openoffice/branches/ia2/main/sw/source/ui/inc/conttree.hxx Tue Apr 23 09:51:15 2013
@@ -36,6 +36,10 @@ class SwGlblDocContents;
class SwGlblDocContent;
class SfxObjectShell;
+//IAccessibility2 Implementation 2009-----
+//Solution: Include SdrObject class
+class SdrObject;
+//-----IAccessibility2 Implementation 2009
#define EDIT_MODE_EDIT 0
#define EDIT_MODE_UPD_IDX 1
@@ -89,7 +93,10 @@ class SwContentTree : public SvTreeListB
sal_Bool bIsImageListInitialized : 1;
static sal_Bool bIsInDrag;
-
+ //IAccessibility2 Implementation 2009-----
+ sal_Bool bIsKeySpace;
+ Rectangle oldRectangle;
+ //-----IAccessibility2 Implementation 2009
void FindActiveTypeAndRemoveUserData();
using SvLBox::ExecuteDrop;
@@ -144,6 +151,11 @@ protected:
public:
SwContentTree(Window* pParent, const ResId& rResId);
~SwContentTree();
+ //IAccessibility2 Implementation 2009-----
+ String GetEntryAltText( SvLBoxEntry* pEntry ) const;
+ String GetEntryLongDescription( SvLBoxEntry* pEntry ) const;
+ SdrObject* GetDrawingObjectsByContent(const SwContent *pCnt);
+ //-----IAccessibility2 Implementation 2009
sal_Bool ToggleToRoot();
sal_Bool IsRoot() const {return bIsRoot;}
@@ -196,6 +208,9 @@ public:
virtual void KeyInput(const KeyEvent& rKEvt);
virtual sal_Bool Select( SvLBoxEntry* pEntry, sal_Bool bSelect=sal_True );
+ //IAccessibility2 Implementation 2009-----
+ virtual sal_Int32 GetEntryRealChildsNum( SvLBoxEntry* pEntry ) const;
+ //-----IAccessibility2 Implementation 2009
};
Modified: openoffice/branches/ia2/main/sw/source/ui/inc/drwbassh.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/inc/drwbassh.hxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/ui/inc/drwbassh.hxx (original)
+++ openoffice/branches/ia2/main/sw/source/ui/inc/drwbassh.hxx Tue Apr 23 09:51:15 2013
@@ -49,6 +49,7 @@ public:
void Execute(SfxRequest &);
void GetState(SfxItemSet &);
+ void GetDrawAttrStateForIFBX( SfxItemSet& rSet );
void DisableState(SfxItemSet &rSet) { Disable(rSet);}
sal_Bool Disable(SfxItemSet& rSet, sal_uInt16 nWhich = 0);
Modified: openoffice/branches/ia2/main/sw/source/ui/inc/drwtxtsh.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/inc/drwtxtsh.hxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/ui/inc/drwtxtsh.hxx (original)
+++ openoffice/branches/ia2/main/sw/source/ui/inc/drwtxtsh.hxx Tue Apr 23 09:51:15 2013
@@ -60,6 +60,7 @@ public:
void Execute(SfxRequest &);
void ExecDraw(SfxRequest &);
+ void GetStatePropPanelAttr(SfxItemSet &);
void GetState(SfxItemSet &);
void GetDrawTxtCtrlState(SfxItemSet&);
Modified: openoffice/branches/ia2/main/sw/source/ui/inc/edtwin.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/inc/edtwin.hxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/ui/inc/edtwin.hxx (original)
+++ openoffice/branches/ia2/main/sw/source/ui/inc/edtwin.hxx Tue Apr 23 09:51:15 2013
@@ -297,6 +297,9 @@ public:
SwEditWin(Window *pParent, SwView &);
virtual ~SwEditWin();
+ //IAccessibility2 Implementation 2009-----
+ virtual void SwitchView();
+ //-----IAccessibility2 Implementation 2009
};
#endif
Modified: openoffice/branches/ia2/main/sw/source/ui/inc/pview.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/inc/pview.hxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/ui/inc/pview.hxx (original)
+++ openoffice/branches/ia2/main/sw/source/ui/inc/pview.hxx Tue Apr 23 09:51:15 2013
@@ -164,6 +164,9 @@ public:
virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible>
CreateAccessible();
+ //IAccessibility2 Implementation 2009-----
+ virtual void SwitchView();
+ //-----IAccessibility2 Implementation 2009
};
@@ -175,7 +178,7 @@ class SW_DLLPUBLIC SwPagePreView: public
{
// ViewWindow und Henkel zur Core
// aktuelle Dispatcher-Shell
- SwPagePreViewWin aViewWin;
+ SwPagePreViewWin* pViewWin;//IAccessibility2 Implementation 2009
//viewdata of the previous SwView and the new crsrposition
String sSwViewData,
//and the new cursor position if the user double click in the PagePreView
@@ -251,11 +254,11 @@ public:
TYPEINFO();
inline Window* GetFrameWindow() const { return &(GetViewFrame())->GetWindow(); }
- inline ViewShell* GetViewShell() const { return aViewWin.GetViewShell(); }
+ inline ViewShell* GetViewShell() const { return pViewWin->GetViewShell(); }
inline const Rectangle& GetVisArea() const { return aVisArea; }
- inline void GrabFocusViewWin() { aViewWin.GrabFocus(); }
+ inline void GrabFocusViewWin() { pViewWin->GrabFocus(); }
inline void RepaintCoreRect( const SwRect& rRect )
- { aViewWin.RepaintCoreRect( rRect ); }
+ { pViewWin->RepaintCoreRect( rRect ); }
void DocSzChgd(const Size& rNewSize);
const Size& GetDocSz() const { return aDocSz; }
Modified: openoffice/branches/ia2/main/sw/source/ui/inc/swlbox.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/inc/swlbox.hxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/ui/inc/swlbox.hxx (original)
+++ openoffice/branches/ia2/main/sw/source/ui/inc/swlbox.hxx Tue Apr 23 09:51:15 2013
@@ -115,6 +115,9 @@ public:
void SetStyle(const sal_uInt16 nSt) { nStyle = nSt; }
String GetText() const;
+//IAccessibility2 Impplementaton 2009-----
+ void SetText( const XubString& rStr );
+ void SetText( const XubString& rStr, const Selection& rNewSelection ) { ComboBox::SetText( rStr, rNewSelection ); };
};
#endif /* _SWLBOX_HXX */
Modified: openoffice/branches/ia2/main/sw/source/ui/inc/swuicnttab.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/inc/swuicnttab.hxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/ui/inc/swuicnttab.hxx (original)
+++ openoffice/branches/ia2/main/sw/source/ui/inc/swuicnttab.hxx Tue Apr 23 09:51:15 2013
@@ -286,6 +286,12 @@ class SwTokenWindow : public Window
Link aButtonSelectedHdl;
Control* pActiveCtrl;
Link aModifyHdl;
+//IAccessibility2 Impplementaton 2009-----
+ String accessibleName;
+ String sAdditionalAccnameString1;
+ String sAdditionalAccnameString2;
+ String sAdditionalAccnameString3;
+//-----IAccessibility2 Impplementaton 2009
SwTOXEntryTabPage* m_pParent;
@@ -337,6 +343,11 @@ public:
virtual void Resize();
virtual void GetFocus();
+//IAccessibility2 Impplementaton 2009-----
+ void SetFocus2theAllBtn();
+private:
+ sal_uInt32 GetControlIndex(FormTokenType eType, const Control* pCurControl) const;
+//-----IAccessibility2 Impplementaton 2009
};
/* -----------------------------23.12.99 14:16--------------------------------
@@ -482,6 +493,10 @@ public:
String GetLevelHelp(sal_uInt16 nLevel) const;
void PreTokenButtonRemoved(const SwFormToken& rToken);
+//IAccessibility2 Impplementaton 2009-----
+ void SetFocus2theAllBtn();
+ virtual long Notify( NotifyEvent& rNEvt );
+//-----IAccessibility2 Impplementaton 2009
};
/* -----------------05.07.99 13:00-------------------
Modified: openoffice/branches/ia2/main/sw/source/ui/inc/textsh.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/inc/textsh.hxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/ui/inc/textsh.hxx (original)
+++ openoffice/branches/ia2/main/sw/source/ui/inc/textsh.hxx Tue Apr 23 09:51:15 2013
@@ -64,6 +64,7 @@ public:
void ExecMoveLingu(SfxRequest &);
void ExecMoveMisc(SfxRequest &);
void ExecField(SfxRequest &rReq);
+ void ExecSetNumber(SfxRequest &);
void StateField(SfxItemSet &);
void ExecIdx(SfxRequest &);
void GetIdxState(SfxItemSet &);
Modified: openoffice/branches/ia2/main/sw/source/ui/inc/tmpdlg.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/inc/tmpdlg.hxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/ui/inc/tmpdlg.hxx (original)
+++ openoffice/branches/ia2/main/sw/source/ui/inc/tmpdlg.hxx Tue Apr 23 09:51:15 2013
@@ -35,26 +35,29 @@ class SwWrtShell;
class SwTemplateDlg: public SfxStyleDialog
{
- sal_uInt16 nType;
- sal_uInt16 nHtmlMode;
- SwWrtShell* pWrtShell;
- sal_Bool bNewStyle;
+ sal_uInt16 nType;
+ sal_uInt16 nHtmlMode;
+ SwWrtShell* pWrtShell;
+ sal_Bool bNewStyle;
- DECL_LINK( NumOptionsHdl, PushButton* );
+ DECL_LINK( NumOptionsHdl, PushButton* );
public:
- SwTemplateDlg( Window* pParent,
- SfxStyleSheetBase& rBase,
- sal_uInt16 nRegion,
- sal_Bool bColumn = sal_False,
- SwWrtShell* pActShell = 0,
- sal_Bool bNew = sal_False );
+ // @param nSlot
+ // Identifies optional Slot by which the creation of the Template (Style) dialog is triggered.
+ // Currently used, if nRegion == SFX_STYLE_FAMILY_PAGE in order to activate certain dialog pane
+ SwTemplateDlg( Window* pParent,
+ SfxStyleSheetBase& rBase,
+ sal_uInt16 nRegion,
+ const sal_uInt16 nSlot = 0,
+ SwWrtShell* pActShell = 0,
+ sal_Bool bNew = sal_False );
- ~SwTemplateDlg();
- const SfxItemSet* GetRefreshedSet();
+ ~SwTemplateDlg();
+ const SfxItemSet* GetRefreshedSet();
- virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
- virtual short Ok();
+ virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
+ virtual short Ok();
};
Modified: openoffice/branches/ia2/main/sw/source/ui/inc/view.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/inc/view.hxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/ui/inc/view.hxx (original)
+++ openoffice/branches/ia2/main/sw/source/ui/inc/view.hxx Tue Apr 23 09:51:15 2013
@@ -200,7 +200,10 @@ class SW_DLLPUBLIC SwView: public SfxVie
sNewCrsrPos;
// to support keyboard the number of the page to go to can be set too
sal_uInt16 nNewPage;
-
+ //IAccessibility2 Implementation 2009-----
+ sal_uInt16 nOldPageNum;
+ String nOldSectionName;
+ //-----IAccessibility2 Implementation 2009
Point aTabColFromDocPos; //Verschieben von Tabellenspalten aus
//aus dem Dokument heraus.
SwTxtNode * pNumRuleNodeFromDoc; // Moving indent of numrule #i23726#