[Libreoffice-commits] .: 2 commits - sc/inc sc/source
Kohei Yoshida
kohei at kemper.freedesktop.org
Sat Nov 6 08:46:43 PDT 2010
sc/inc/compiler.hxx | 2
sc/inc/global.hxx | 6 --
sc/inc/unonames.hxx | 3 -
sc/source/core/tool/compiler.cxx | 4 -
sc/source/core/tool/rangeutl.cxx | 2
sc/source/core/tool/reftokenhelper.cxx | 2
sc/source/ui/Accessibility/AccessibleText.cxx | 3 -
sc/source/ui/dbgui/validate.cxx | 2
sc/source/ui/drawfunc/fudraw.cxx | 19 -------
sc/source/ui/optdlg/tpview.cxx | 63 --------------------------
sc/source/ui/unoobj/confuno.cxx | 2
sc/source/ui/view/cellsh2.cxx | 4 -
12 files changed, 8 insertions(+), 104 deletions(-)
New commits:
commit 2d63a40532dfe215b52a8cd3433673bb2d0f38c6
Author: Kohei Yoshida <kyoshida at novell.com>
Date: Sat Nov 6 11:25:04 2010 -0400
Did some additional cleanups.
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index 08b911d..57de6f8 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -533,8 +533,6 @@ private:
{ return c < 128 ? pConv->getCharTableFlags(c, cLast) : 0; }
};
-SC_DLLPUBLIC String GetScCompilerNativeSymbol( OpCode eOp );
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index 1ac1c25..a1fc0fa 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -887,10 +887,6 @@ struct ScConsolidateParam
void SetAreas ( ScArea* const* ppAreas, USHORT nCount );
};
-// -----------------------------------------------------------------------
-extern ::utl::TransliterationWrapper* GetScGlobalpTransliteration();
-extern const LocaleDataWrapper* GetScGlobalpLocaleData();
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/unonames.hxx b/sc/inc/unonames.hxx
index f2725fb..9aeccbf 100644
--- a/sc/inc/unonames.hxx
+++ b/sc/inc/unonames.hxx
@@ -622,6 +622,7 @@
#define SC_UNONAME_XLA1REPR "XLA1Representation"
#define SC_UNONAME_REFSHEET "ReferenceSheet"
+// Security options
#define SC_UNO_LOADREADONLY "LoadReadonly"
#define SC_UNO_MODIFYPASSWORDINFO "ModifyPasswordInfo"
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 536bd68..e5eb562 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -5475,10 +5475,6 @@ BOOL ScCompiler::HandleDbData()
return TRUE;
}
-String GetScCompilerNativeSymbol( OpCode eOp )
-{
- return ScCompiler::GetNativeSymbol( eOp );
-}
// -----------------------------------------------------------------------------
FormulaTokenRef ScCompiler::ExtendRangeReference( FormulaToken & rTok1, FormulaToken & rTok2, bool bReuseDoubleRef )
{
diff --git a/sc/source/core/tool/rangeutl.cxx b/sc/source/core/tool/rangeutl.cxx
index 08a07c0..752914e 100644
--- a/sc/source/core/tool/rangeutl.cxx
+++ b/sc/source/core/tool/rangeutl.cxx
@@ -881,7 +881,7 @@ static void lcl_appendCellRangeAddress(
void ScRangeStringConverter::GetStringFromXMLRangeString( OUString& rString, const OUString& rXMLRange, ScDocument* pDoc )
{
FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention();
- const OUString aRangeSep = GetScCompilerNativeSymbol(ocSep);
+ const OUString aRangeSep = ScCompiler::GetNativeSymbol(ocSep);
const sal_Unicode cSep = ' ';
const sal_Unicode cQuote = '\'';
diff --git a/sc/source/core/tool/reftokenhelper.cxx b/sc/source/core/tool/reftokenhelper.cxx
index 83df2dd..1d28745 100644
--- a/sc/source/core/tool/reftokenhelper.cxx
+++ b/sc/source/core/tool/reftokenhelper.cxx
@@ -49,7 +49,7 @@ using ::rtl::OUString;
void ScRefTokenHelper::compileRangeRepresentation(
vector<ScSharedTokenRef>& rRefTokens, const OUString& rRangeStr, ScDocument* pDoc, FormulaGrammar::Grammar eGrammar)
{
- const sal_Unicode cSep = GetScCompilerNativeSymbol(ocSep).GetChar(0);
+ const sal_Unicode cSep = ScCompiler::GetNativeSymbol(ocSep).GetChar(0);
const sal_Unicode cQuote = '\'';
// #i107275# ignore parentheses
diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx
index 8f514ba..0ff9186 100644
--- a/sc/source/ui/Accessibility/AccessibleText.cxx
+++ b/sc/source/ui/Accessibility/AccessibleText.cxx
@@ -1109,6 +1109,7 @@ SvxViewForwarder* ScAccessibleEditObjectTextData::GetViewForwarder()
{
if (!mpViewForwarder)
{
+ // i#49561 Get right-aligned cell content to be read by screenreader.
mpViewForwarder = new ScEditObjectViewForwarder( mpWindow, mpEditView );
}
return mpViewForwarder;
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index 9ec9740..23849bf 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++ b/sc/source/ui/dbgui/validate.cxx
@@ -339,7 +339,7 @@ ScTPValidationValue::ScTPValidationValue( Window* pParent, const SfxItemSet& rAr
FreeResource();
// list separator in formulas
- String aListSep = ::GetScCompilerNativeSymbol( ocSep );
+ String aListSep = ::ScCompiler::GetNativeSymbol( ocSep );
DBG_ASSERT( aListSep.Len() == 1, "ScTPValidationValue::ScTPValidationValue - list separator error" );
mcFmlaSep = aListSep.Len() ? aListSep.GetChar( 0 ) : ';';
m_btnRef.Hide(); // cell range picker
commit 4b08625db65157d7bf694072e9e4e7069c7b7414
Author: Alexander O. Anisimov <alenyashka at gmail.com>
Date: Sat Nov 6 10:55:14 2010 -0400
Remove bogus comments.
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index c492f2f..08b911d 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -533,7 +533,7 @@ private:
{ return c < 128 ? pConv->getCharTableFlags(c, cLast) : 0; }
};
-SC_DLLPUBLIC String GetScCompilerNativeSymbol( OpCode eOp ); //CHINA001
+SC_DLLPUBLIC String GetScCompilerNativeSymbol( OpCode eOp );
#endif
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index bf364a9..1ac1c25 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -584,7 +584,7 @@ public:
static IntlWrapper* GetScIntlWrapper();
static ::com::sun::star::lang::Locale* GetLocale();
- SC_DLLPUBLIC static ::utl::TransliterationWrapper* GetpTransliteration(); //CHINA001
+ SC_DLLPUBLIC static ::utl::TransliterationWrapper* GetpTransliteration();
static ::utl::TransliterationWrapper* GetCaseTransliteration();
SC_DLLPUBLIC static LanguageType eLnge;
@@ -888,7 +888,7 @@ struct ScConsolidateParam
};
// -----------------------------------------------------------------------
-extern ::utl::TransliterationWrapper* GetScGlobalpTransliteration();//CHINA001
+extern ::utl::TransliterationWrapper* GetScGlobalpTransliteration();
extern const LocaleDataWrapper* GetScGlobalpLocaleData();
#endif
diff --git a/sc/inc/unonames.hxx b/sc/inc/unonames.hxx
index 1bb5aac..f2725fb 100644
--- a/sc/inc/unonames.hxx
+++ b/sc/inc/unonames.hxx
@@ -622,9 +622,7 @@
#define SC_UNONAME_XLA1REPR "XLA1Representation"
#define SC_UNONAME_REFSHEET "ReferenceSheet"
-// --> PB 2004-08-23 #i33095# Security Options
#define SC_UNO_LOADREADONLY "LoadReadonly"
-// <--
#define SC_UNO_MODIFYPASSWORDINFO "ModifyPasswordInfo"
// FormulaParser
diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx
index 2f7c5e8..8f514ba 100644
--- a/sc/source/ui/Accessibility/AccessibleText.cxx
+++ b/sc/source/ui/Accessibility/AccessibleText.cxx
@@ -1109,9 +1109,7 @@ SvxViewForwarder* ScAccessibleEditObjectTextData::GetViewForwarder()
{
if (!mpViewForwarder)
{
- // --> OD 2005-12-21 #i49561#
mpViewForwarder = new ScEditObjectViewForwarder( mpWindow, mpEditView );
- // <--
}
return mpViewForwarder;
}
diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx
index a96a162..e07b1a9 100644
--- a/sc/source/ui/drawfunc/fudraw.cxx
+++ b/sc/source/ui/drawfunc/fudraw.cxx
@@ -249,25 +249,6 @@ BOOL __EXPORT FuDraw::KeyInput(const KeyEvent& rKEvt)
switch ( rKEvt.GetKeyCode().GetCode() )
{
case KEY_ESCAPE:
-
- /* 18.12.95: TextShell beibehalten nicht mehr gewuenscht...
- *
- * if ( pView->IsAction() )
- * {
- * pView->BrkAction();
- * pWindow->ReleaseMouse();
- * bReturn = TRUE;
- * }
- * else if ( pView->IsTextEdit() )
- * {
- * pView->EndTextEdit();
- * pView->SetCreateMode();
- * pViewShell->GetScDrawView()->InvalidateDrawTextAttrs();
- * bReturn = TRUE;
- * }
- * else
- */
-
if ( pViewShell->IsDrawTextShell() || aSfxRequest.GetSlot() == SID_DRAW_NOTEEDIT )
{
// in normale Draw-Shell, wenn Objekt selektiert, sonst Zeichnen aus
diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx
index b46efdb..30ec91e 100644
--- a/sc/source/ui/optdlg/tpview.cxx
+++ b/sc/source/ui/optdlg/tpview.cxx
@@ -57,10 +57,6 @@
-/*-----------------11.01.97 10.52-------------------
- Optionen Inhalte
---------------------------------------------------*/
-
ScTpContentOptions::ScTpContentOptions( Window* pParent,
const SfxItemSet& rArgSet ) :
SfxTabPage(pParent, ScResId( RID_SCPAGE_CONTENT ), rArgSet),
@@ -133,26 +129,18 @@ ScTpContentOptions::ScTpContentOptions( Window* pParent,
aGridCB .SetClickHdl( LINK( this, ScTpContentOptions, GridHdl ) );
}
-/*-----------------11.01.97 10.52-------------------
-
---------------------------------------------------*/
ScTpContentOptions::~ScTpContentOptions()
{
delete pLocalOptions;
}
-/*-----------------11.01.97 10.52-------------------
-
---------------------------------------------------*/
SfxTabPage* ScTpContentOptions::Create( Window* pParent,
const SfxItemSet& rCoreSet )
{
return new ScTpContentOptions(pParent, rCoreSet);
}
-/*-----------------11.01.97 10.52-------------------
---------------------------------------------------*/
BOOL ScTpContentOptions::FillItemSet( SfxItemSet& rCoreSet )
{
BOOL bRet = FALSE;
@@ -196,9 +184,6 @@ BOOL ScTpContentOptions::FillItemSet( SfxItemSet& rCoreSet )
return bRet;
}
-/*-----------------11.01.97 10.53-------------------
-
---------------------------------------------------*/
void ScTpContentOptions::Reset( const SfxItemSet& rCoreSet )
{
@@ -261,9 +246,6 @@ void ScTpContentOptions::Reset( const SfxItemSet& rCoreSet )
aHandleCB .SaveValue();
aBigHandleCB .SaveValue();
}
-/*-----------------11.01.97 12.45-------------------
-
---------------------------------------------------*/
void ScTpContentOptions::ActivatePage( const SfxItemSet& rSet)
{
@@ -271,9 +253,6 @@ void ScTpContentOptions::ActivatePage( const SfxItemSet& rSet)
if(SFX_ITEM_SET == rSet.GetItemState(SID_SCVIEWOPTIONS, FALSE , &pItem))
*pLocalOptions = ((const ScTpViewItem*)pItem)->GetViewOptions();
}
-/*-----------------11.01.97 12.45-------------------
-
---------------------------------------------------*/
int ScTpContentOptions::DeactivatePage( SfxItemSet* pSetP )
{
@@ -281,9 +260,6 @@ int ScTpContentOptions::DeactivatePage( SfxItemSet* pSetP )
FillItemSet(*pSetP);
return SfxTabPage::LEAVE_PAGE;
}
-/*-----------------11.01.97 13.43-------------------
-
---------------------------------------------------*/
IMPL_LINK( ScTpContentOptions, SelLbObjHdl, ListBox*, pLb )
{
@@ -301,10 +277,6 @@ IMPL_LINK( ScTpContentOptions, SelLbObjHdl, ListBox*, pLb )
return 0;
}
-/*-----------------11.01.97 14.25-------------------
-
---------------------------------------------------*/
-
IMPL_LINK( ScTpContentOptions, CBHdl, CheckBox*, pBtn )
{
ScViewOption eOption = VOPT_FORMULAS;
@@ -335,9 +307,6 @@ IMPL_LINK( ScTpContentOptions, CBHdl, CheckBox*, pBtn )
return 0;
}
-/*-----------------11.01.97 13.13-------------------
-
---------------------------------------------------*/
void ScTpContentOptions::InitGridOpt()
{
@@ -407,9 +376,6 @@ void ScTpContentOptions::InitGridOpt()
else
aColorLB.SelectEntryPos( aColorLB.InsertEntry( aCol, aName ) );
}
-/*-----------------11.01.97 13.40-------------------
-
---------------------------------------------------*/
IMPL_LINK( ScTpContentOptions, GridHdl, CheckBox*, pBox )
{
@@ -419,9 +385,6 @@ IMPL_LINK( ScTpContentOptions, GridHdl, CheckBox*, pBox )
pLocalOptions->SetOption( VOPT_GRID, bChecked );
return 0;
}
-/*-----------------11.01.97 10.53-------------------
-
---------------------------------------------------*/
ScTpLayoutOptions::ScTpLayoutOptions( Window* pParent,
const SfxItemSet& rArgSet ) :
@@ -485,16 +448,10 @@ ScTpLayoutOptions::ScTpLayoutOptions( Window* pParent,
}
}
-/*-----------------11.01.97 10.53-------------------
-
---------------------------------------------------*/
ScTpLayoutOptions::~ScTpLayoutOptions()
{
}
-/*-----------------11.01.97 10.53-------------------
-
---------------------------------------------------*/
SfxTabPage* ScTpLayoutOptions::Create( Window* pParent,
const SfxItemSet& rCoreSet )
@@ -506,9 +463,6 @@ SfxTabPage* ScTpLayoutOptions::Create( Window* pParent,
pNew->SetDocument(pDocSh->GetDocument());
return pNew;
}
-/*-----------------11.01.97 10.53-------------------
-
---------------------------------------------------*/
BOOL ScTpLayoutOptions::FillItemSet( SfxItemSet& rCoreSet )
{
@@ -601,9 +555,6 @@ BOOL ScTpLayoutOptions::FillItemSet( SfxItemSet& rCoreSet )
return bRet;
}
-/*-----------------11.01.97 10.53-------------------
-
---------------------------------------------------*/
void ScTpLayoutOptions::Reset( const SfxItemSet& rCoreSet )
{
@@ -697,16 +648,9 @@ void ScTpLayoutOptions::Reset( const SfxItemSet& rCoreSet )
aRequestRB.SaveValue();
}
-/*-----------------11.01.97 12.46-------------------
-
---------------------------------------------------*/
-
void ScTpLayoutOptions::ActivatePage( const SfxItemSet& /* rCoreSet */ )
{
}
-/*-----------------11.01.97 12.46-------------------
-
---------------------------------------------------*/
int ScTpLayoutOptions::DeactivatePage( SfxItemSet* pSetP )
{
@@ -715,11 +659,6 @@ int ScTpLayoutOptions::DeactivatePage( SfxItemSet* pSetP )
return SfxTabPage::LEAVE_PAGE;
}
-
-/*-----------------13.01.97 14.44-------------------
- Metric des Deftabstops umschalten
---------------------------------------------------*/
-
IMPL_LINK(ScTpLayoutOptions, MetricHdl, ListBox*, EMPTYARG)
{
const USHORT nMPos = aUnitLB.GetSelectEntryPos();
@@ -734,9 +673,7 @@ IMPL_LINK(ScTpLayoutOptions, MetricHdl, ListBox*, EMPTYARG)
return 0;
}
-/*-----------------11.01.97 15.30-------------------
---------------------------------------------------*/
IMPL_LINK( ScTpLayoutOptions, AlignHdl, CheckBox*, pBox )
{
aAlignLB.Enable(pBox->IsChecked());
diff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxx
index a9021c1..90fabb1 100644
--- a/sc/source/ui/unoobj/confuno.cxx
+++ b/sc/source/ui/unoobj/confuno.cxx
@@ -85,9 +85,7 @@ const SfxItemPropertyMapEntry* lcl_GetConfigPropertyMap()
{MAP_CHAR_LEN(SC_UNO_UPDTEMPL), 0, &getBooleanCppuType(), 0, 0},
/*Stampit enable/disable print cancel */
{MAP_CHAR_LEN(SC_UNO_ALLOWPRINTJOBCANCEL), 0, &getBooleanCppuType(), 0, 0},
- // --> PB 2004-08-25 #i33095# Security Options
{MAP_CHAR_LEN(SC_UNO_LOADREADONLY), 0, &getBooleanCppuType(), 0, 0},
- // <--
{MAP_CHAR_LEN(SC_UNO_SHAREDOC), 0, &getBooleanCppuType(), 0, 0},
{MAP_CHAR_LEN(SC_UNO_MODIFYPASSWORDINFO), 0, &getCppuType((uno::Sequence< beans::PropertyValue >*)0), 0, 0},
{0,0,0,0,0,0}
diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx
index 806ccbd..1ef175c 100644
--- a/sc/source/ui/view/cellsh2.cxx
+++ b/sc/source/ui/view/cellsh2.cxx
@@ -338,10 +338,10 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
case SID_DATA_FORM:
{
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+ DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
AbstractScDataFormDlg* pDlg = pFact->CreateScDataFormDlg( pTabViewShell->GetDialogParent(),RID_SCDLG_DATAFORM, pTabViewShell);
- DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+ DBG_ASSERT(pDlg, "Dialog create fail!");
pDlg->Execute();
More information about the Libreoffice-commits
mailing list