[Libreoffice-commits] .: Branch 'integration/dev300_m101' - sc/inc sc/source
Kohei Yoshida
kohei at kemper.freedesktop.org
Mon Mar 14 18:02:22 PDT 2011
sc/inc/sc.hrc | 2
sc/inc/unonames.hxx | 3
sc/source/core/tool/interpr4.cxx | 2
sc/source/core/tool/token.cxx | 4
sc/source/ui/docshell/docsh4.cxx | 350 ---------------------------------------
sc/source/ui/inc/docfunc.hxx | 3
sc/source/ui/src/condfrmt.src | 14 +
sc/source/ui/src/hdrcont.src | 18 +-
sc/source/ui/src/miscdlgs.src | 1
sc/source/ui/src/popup.src | 2
sc/source/ui/src/sortdlg.src | 3
sc/source/ui/src/toolbox.src | 127 --------------
sc/source/ui/unoobj/appluno.cxx | 15 -
sc/source/ui/unoobj/dapiuno.cxx | 4
sc/source/ui/unoobj/fmtuno.cxx | 11 -
sc/source/ui/unoobj/linkuno.cxx | 6
sc/source/ui/unoobj/scdetect.cxx | 2
sc/source/ui/unoobj/styleuno.cxx | 4
sc/source/ui/unoobj/viewuno.cxx | 2
19 files changed, 45 insertions(+), 528 deletions(-)
New commits:
commit d9a93d1a552a8cf3c04ac2c9cccc0e600816d11f
Author: Kohei Yoshida <kyoshida at novell.com>
Date: Mon Mar 14 18:21:05 2011 -0400
More on build errors and warnings.
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index f63dc01..9fedfad 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -951,7 +951,7 @@
#define STR_ACC_DATAPILOT_PAGE_DESCR (STR_START + 182)
//IAccessibility2 Implementation 2009-----
-#define STR_ACC_TOOLBAR_FORMULA (STR_START + 182)
+#define STR_ACC_TOOLBAR_FORMULA (STR_START + 184)
#define STR_ACC_DOC_SPREADSHEET (STR_START + 185)
#define STR_ACC_DOC_PREVIEW_SUFFIX (STR_START + 186)
#define STR_ACC_DOC_SPREADSHEET_READONLY (STR_START + 187)
diff --git a/sc/inc/unonames.hxx b/sc/inc/unonames.hxx
index 2028f8a..fb557be 100644
--- a/sc/inc/unonames.hxx
+++ b/sc/inc/unonames.hxx
@@ -537,6 +537,7 @@
#define SC_UNO_ZOOMVALUE "ZoomValue"
#define SC_UNO_UPDTEMPL "UpdateFromTemplate"
#define SC_UNO_FILTERED_RANGE_SELECTION "FilteredRangeSelection"
+#define SC_UNO_VISAREASCREEN "VisibleAreaOnScreen"
/*Stampit enable/disable print cancel */
#define SC_UNO_ALLOWPRINTJOBCANCEL "AllowPrintJobCancel"
@@ -619,7 +620,7 @@
#define SC_UNONAME_ADDRESS "Address"
#define SC_UNONAME_UIREPR "UserInterfaceRepresentation"
#define SC_UNONAME_PERSREPR "PersistentRepresentation"
-#define SC_UNONAME_XLA1REPR "XLA1Representation"
+#define SC_UNONAME_XLA1REPR "XLA1Representation"
#define SC_UNONAME_REFSHEET "ReferenceSheet"
// Security options
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index c32e76e..a30ac55 100755
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -3287,8 +3287,6 @@ void ScInterpreter::ScMacro()
PushString( refRes->GetString() );
}
- pSfxApp->LeaveBasicCall();
-
if (bVolatileMacro && meVolaileType == NOT_VOLATILE)
meVolaileType = VOLATILE_MACRO;
}
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 673c5cc..db3db54 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -971,7 +971,7 @@ const String& ScExternalNameToken::GetString() const
return maName;
}
-sal_Bool ScExternalNameToken::operator==( const FormulaToken& r ) const
+bool ScExternalNameToken::operator==( const FormulaToken& r ) const
{
if ( !FormulaToken::operator==(r) )
return false;
@@ -997,7 +997,7 @@ sal_Bool ScExternalNameToken::operator==( const FormulaToken& r ) const
// ============================================================================
ScJumpMatrix* ScJumpMatrixToken::GetJumpMatrix() const { return pJumpMatrix; }
-sal_Bool ScJumpMatrixToken::operator==( const FormulaToken& r ) const
+bool ScJumpMatrixToken::operator==( const FormulaToken& r ) const
{
return FormulaToken::operator==( r ) && pJumpMatrix == static_cast<const ScToken&>(r).GetJumpMatrix();
}
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index a4571e0..0d8ea68 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -1799,356 +1799,6 @@ void ScDocShell::GetStatePageStyle( SfxViewShell& /* rCaller */,
}
}
-void lcl_GetPrintData( ScDocShell* pDocShell /*in*/,
- ScDocument* pDocument /*in*/, SfxPrinter* pPrinter /*in*/,
- PrintDialog* pPrintDialog /*in*/, bool bForceSelected /*in*/,
- ScMarkData* pMarkData /*inout*/, bool& rbHasOptions /*out*/,
- ScPrintOptions& rOptions /*out*/, bool& rbAllTabs /*out*/,
- long& rnTotalPages /*out*/, long aPageArr[] /*out*/,
- MultiSelection& rPageRanges /*out*/, ScRange** ppMarkedRange /*out*/ )
-{
- // get settings from print options sub-dialog
- const SfxItemSet& rOptionSet = pPrinter->GetOptions();
- const SfxPoolItem* pItem;
- rbHasOptions = ( rOptionSet.GetItemState( SID_SCPRINTOPTIONS, false, &pItem ) == SFX_ITEM_SET );
- if ( rbHasOptions )
- {
- rOptions = ((const ScTpPrintItem*)pItem)->GetPrintOptions();
- }
- else
- {
- // use configuration
- rOptions = SC_MOD()->GetPrintOptions();
- }
-
- // update all pending row heights with a single progress bar,
- // instead of a separate progress for each sheet from ScPrintFunc
- pDocShell->UpdatePendingRowHeights( MAXTAB, true );
-
- // get number of total pages
- rnTotalPages = 0;
- SCTAB nTabCount = pDocument->GetTableCount();
- for ( SCTAB nTab = 0; nTab < nTabCount; ++nTab )
- {
- ScPrintFunc aPrintFunc( pDocShell, pPrinter, nTab, 0, 0, NULL, &rOptions );
- long nThisTab = aPrintFunc.GetTotalPages();
- aPageArr[nTab] = nThisTab;
- rnTotalPages += nThisTab;
- }
-
- rPageRanges.SetTotalRange( Range( 0, RANGE_MAX ) );
- rPageRanges.Select( Range( 1, rnTotalPages ) );
-
- rbAllTabs = ( pPrintDialog ? ( pPrintDialog->GetCheckedSheetRange() == PRINTSHEETS_ALL ) : SC_MOD()->GetPrintOptions().GetAllSheets() );
- if ( bForceSelected )
- {
- rbAllTabs = false;
- }
-
- if ( ( pPrintDialog && pPrintDialog->GetCheckedSheetRange() == PRINTSHEETS_SELECTED_CELLS ) || bForceSelected )
- {
- if ( pMarkData && ( pMarkData->IsMarked() || pMarkData->IsMultiMarked() ) )
- {
- pMarkData->MarkToMulti();
- *ppMarkedRange = new ScRange;
- pMarkData->GetMultiMarkArea( **ppMarkedRange );
- pMarkData->MarkToSimple();
- }
- }
-
- PrintDialogRange eDlgOption = pPrintDialog ? pPrintDialog->GetCheckedRange() : PRINTDIALOG_ALL;
- if ( eDlgOption == PRINTDIALOG_RANGE )
- {
- rPageRanges = MultiSelection( pPrintDialog->GetRangeText() );
- }
-
- // get number of total pages if selection
- if ( !rbAllTabs )
- {
- rnTotalPages = 0;
- for ( SCTAB nTab = 0; nTab < nTabCount; ++nTab )
- {
- if ( *ppMarkedRange ) // selected range is used instead of print ranges -> page count is different
- {
- ScPrintFunc aPrintFunc( pDocShell, pPrinter, nTab, 0, 0, *ppMarkedRange, &rOptions );
- aPageArr[nTab] = aPrintFunc.GetTotalPages();
- }
- if ( !pMarkData || pMarkData->GetTableSelect( nTab ) )
- {
- rnTotalPages += aPageArr[nTab];
- }
- }
- if ( eDlgOption == PRINTDIALOG_ALL || bForceSelected )
- {
- rPageRanges.Select( Range( 1, rnTotalPages ) );
- }
- }
-}
-
-bool ScDocShell::CheckPrint( PrintDialog* pPrintDialog, ScMarkData* pMarkData, bool bForceSelected, bool bIsAPI )
-{
- SfxPrinter* pPrinter = GetPrinter();
- if ( !pPrinter )
- {
- return false;
- }
-
- bool bHasOptions = false;
- ScPrintOptions aOptions;
- bool bAllTabs = true;
- long nTotalPages = 0;
- long aPageArr[MAXTABCOUNT]; // pages per sheet
- MultiSelection aPageRanges; // pages to print
- ScRange* pMarkedRange = NULL;
-
- lcl_GetPrintData( this, &aDocument, pPrinter, pPrintDialog, bForceSelected,
- pMarkData, bHasOptions, aOptions, bAllTabs, nTotalPages,
- aPageArr, aPageRanges, &pMarkedRange );
-
- delete pMarkedRange;
-
- if ( nTotalPages == 0 )
- {
- if ( !bIsAPI )
- {
- WarningBox aWarningBox( GetActiveDialogParent(), WinBits( WB_OK ),
- String( ScResId( STR_PRINT_NOTHING ) ) );
- aWarningBox.Execute();
- }
- return false;
- }
-
- return true;
-}
-
-void ScDocShell::PreparePrint( PrintDialog* pPrintDialog, ScMarkData* pMarkData )
-{
- SfxPrinter* pPrinter = GetPrinter();
- if ( !pPrinter )
- {
- return;
- }
-
- delete pOldJobSetup; // gesetzt nur bei Fehler in StartJob()
- pOldJobSetup = new ScJobSetup( pPrinter ); // Einstellungen merken
-
- // Einstellungen fuer die erste gedruckte Seite muessen hier (vor StartJob) gesetzt werden
- //! Selection etc. mit Print() zusammenfassen !!!
- //! Seiten nur einmal zaehlen
-
- bool bHasOptions = false;
- ScPrintOptions aOptions;
- bool bAllTabs = true;
- long nTotalPages = 0;
- long aPageArr[MAXTABCOUNT]; // pages per sheet
- MultiSelection aPageRanges; // pages to print
- ScRange* pMarkedRange = NULL;
-
- lcl_GetPrintData( this, &aDocument, pPrinter, pPrintDialog, false,
- pMarkData, bHasOptions, aOptions, bAllTabs, nTotalPages,
- aPageArr, aPageRanges, &pMarkedRange );
-
- sal_Bool bFound = false; // erste Seite gefunden
- long nTabStart = 0;
- SCTAB nTabCount = aDocument.GetTableCount();
- for ( SCTAB nTab=0; nTab<nTabCount && !bFound; nTab++ )
- {
- if ( bAllTabs || !pMarkData || pMarkData->GetTableSelect( nTab ) )
- {
- long nNext = nTabStart + aPageArr[nTab];
- sal_Bool bSelected = false;
- for (long nP=nTabStart+1; nP<=nNext; nP++) // 1-basiert
- if (aPageRanges.IsSelected( nP )) // eine Seite von dieser Tabelle selektiert?
- bSelected = true;
-
- if (bSelected)
- {
- ScPrintFunc aPrintFunc( this, pPrinter, nTab );
-
- aPrintFunc.ApplyPrintSettings(); // dann Settings fuer diese Tabelle
- bFound = true;
- }
- nTabStart = nNext;
- }
- }
-
- delete pMarkedRange;
-}
-
-sal_Bool lcl_HasTransparent( ScDocument* pDoc, SCTAB nTab, const ScRange* pRange )
-{
- sal_Bool bFound = false;
- ScDrawLayer* pDrawLayer = pDoc->GetDrawLayer();
- if (pDrawLayer)
- {
- SdrPage* pPage = pDrawLayer->GetPage(static_cast<sal_uInt16>(nTab));
- DBG_ASSERT(pPage,"Page ?");
- if (pPage)
- {
- Rectangle aMMRect;
- if ( pRange )
- aMMRect = pDoc->GetMMRect( pRange->aStart.Col(), pRange->aStart.Row(),
- pRange->aEnd.Col(), pRange->aEnd.Row(), nTab );
-
- SdrObjListIter aIter( *pPage, IM_DEEPNOGROUPS );
- SdrObject* pObject = aIter.Next();
- while (pObject && !bFound)
- {
- if (pObject->IsTransparent())
- {
- if ( pRange )
- {
- Rectangle aObjRect = pObject->GetLogicRect();
- if ( aObjRect.IsOver( aMMRect ) )
- bFound = true;
- }
- else
- bFound = true;
- }
-
- pObject = aIter.Next();
- }
- }
- }
-
- return bFound;
-}
-
-void ScDocShell::Print( SfxProgress& rProgress, PrintDialog* pPrintDialog,
- ScMarkData* pMarkData, Window* pDialogParent, sal_Bool bForceSelected, sal_Bool bIsAPI )
-{
- SfxPrinter* pPrinter = GetPrinter();
- if ( !pPrinter )
- {
- return;
- }
-
- bool bHasOptions = false;
- ScPrintOptions aOptions;
- bool bAllTabs = true;
- long nTotalPages = 0;
- long aPageArr[MAXTABCOUNT]; // pages per sheet
- MultiSelection aPageRanges; // pages to print
- ScRange* pMarkedRange = NULL;
-
- lcl_GetPrintData( this, &aDocument, pPrinter, pPrintDialog, bForceSelected,
- pMarkData, bHasOptions, aOptions, bAllTabs, nTotalPages,
- aPageArr, aPageRanges, &pMarkedRange );
-
- sal_uInt16 nCollateCopies = 1;
- if ( pPrintDialog && pPrintDialog->IsCollateEnabled() && pPrintDialog->IsCollateChecked() )
- nCollateCopies = pPrintDialog->GetCopyCount();
-
- // test if printed range contains transparent objects
-
- sal_Bool bHasTransp = false;
- sal_Bool bAnyPrintRanges = aDocument.HasPrintRange();
- ScStyleSheetPool* pStylePool = aDocument.GetStyleSheetPool();
- SCTAB nTabCount = aDocument.GetTableCount();
- for ( SCTAB nTab=0; nTab<nTabCount && !bHasTransp; nTab++ )
- {
- if ( bAllTabs || !pMarkData || pMarkData->GetTableSelect( nTab ) )
- {
- SfxStyleSheetBase* pStyleSheet = pStylePool->Find(
- aDocument.GetPageStyle( nTab ), SFX_STYLE_FAMILY_PAGE );
- if ( pStyleSheet )
- {
- const SfxItemSet& rSet = pStyleSheet->GetItemSet();
- if ( ((const ScViewObjectModeItem&)rSet.Get(ATTR_PAGE_CHARTS)).GetValue() == VOBJ_MODE_SHOW ||
- ((const ScViewObjectModeItem&)rSet.Get(ATTR_PAGE_OBJECTS)).GetValue() == VOBJ_MODE_SHOW ||
- ((const ScViewObjectModeItem&)rSet.Get(ATTR_PAGE_DRAWINGS)).GetValue() == VOBJ_MODE_SHOW )
- {
- if ( pMarkedRange )
- bHasTransp = bHasTransp || lcl_HasTransparent( &aDocument, nTab, pMarkedRange );
- else if ( aDocument.GetPrintRangeCount(nTab) )
- {
- sal_uInt16 nRangeCount = aDocument.GetPrintRangeCount(nTab);
- for (sal_uInt16 i=0; i<nRangeCount; i++)
- bHasTransp = bHasTransp ||
- lcl_HasTransparent( &aDocument, nTab, aDocument.GetPrintRange( nTab, i ) );
- }
- else if (!bAnyPrintRanges || aDocument.IsPrintEntireSheet(nTab))
- bHasTransp = bHasTransp || lcl_HasTransparent( &aDocument, nTab, NULL );
- }
- }
- }
- }
-
- sal_Bool bContinue = pPrinter->InitJob( pDialogParent, !bIsAPI && bHasTransp );
-
- if ( bContinue )
- {
- for ( sal_uInt16 n=0; n<nCollateCopies; n++ )
- {
- long nTabStart = 0;
- long nDisplayStart = 0;
- long nAttrPage = 1;
-
- for ( SCTAB nTab=0; nTab<nTabCount; nTab++ )
- {
- if ( bAllTabs || !pMarkData || pMarkData->GetTableSelect( nTab ) )
- {
- FmFormView* pDrawView = NULL;
- Rectangle aFull( 0, 0, LONG_MAX, LONG_MAX );
-
- // #114135#
- ScDrawLayer* pModel = aDocument.GetDrawLayer(); // ist nicht NULL
-
- if(pModel)
- {
- pDrawView = new FmFormView( pModel, pPrinter );
- pDrawView->ShowSdrPage(pDrawView->GetModel()->GetPage(nTab));
- pDrawView->SetPrintPreview( true );
- }
-
- ScPrintFunc aPrintFunc( this, pPrinter, nTab, nAttrPage, nTotalPages, pMarkedRange, &aOptions );
- aPrintFunc.SetDrawView( pDrawView );
- aPrintFunc.DoPrint( aPageRanges, nTabStart, nDisplayStart, true, &rProgress, NULL );
-
- nTabStart += aPageArr[nTab];
- if ( aDocument.NeedPageResetAfterTab(nTab) )
- nDisplayStart = 0;
- else
- nDisplayStart += aPageArr[nTab];
- nAttrPage = aPrintFunc.GetFirstPageNo(); // behalten oder aus Vorlage
-
- delete pDrawView;
- }
- }
- }
- }
-
- delete pMarkedRange;
-
- if (pOldJobSetup)
- {
- pPrinter->SetOrientation( pOldJobSetup->eOrientation );
- pPrinter->SetPaperBin ( pOldJobSetup->nPaperBin );
- pPrinter->SetPaper ( pOldJobSetup->ePaper );
-
- if ( PAPER_USER == pOldJobSetup->ePaper )
- {
- pPrinter->SetMapMode( pOldJobSetup->aUserMapMode );
- pPrinter->SetPaperSizeUser( pOldJobSetup->aUserSize );
- }
-
- delete pOldJobSetup;
- pOldJobSetup = NULL;
- }
-
- if ( bHasOptions )
- {
- // remove PrintOptions from printer ItemSet,
- // so next time the options from the configuration are used
-
- SfxItemSet aSet( pPrinter->GetOptions() );
- aSet.ClearItem( SID_SCPRINTOPTIONS );
- pPrinter->SetOptions( aSet );
- }
-
- PostPaintGridAll(); //! nur wenn geaendert
-}
-
void ScDocShell::GetState( SfxItemSet &rSet )
{
SfxWhichIter aIter(rSet);
diff --git a/sc/source/ui/inc/docfunc.hxx b/sc/source/ui/inc/docfunc.hxx
index dd83141..4c35fe5 100644
--- a/sc/source/ui/inc/docfunc.hxx
+++ b/sc/source/ui/inc/docfunc.hxx
@@ -100,7 +100,8 @@ public:
// creates a new cell for use with PutCell
ScBaseCell* InterpretEnglishString( const ScAddress& rPos, const String& rText,
- const String& rFormulaNmsp, const formula::FormulaGrammar::Grammar eGrammar );
+ const String& rFormulaNmsp, const formula::FormulaGrammar::Grammar eGrammar,
+ short* pRetFormatType = NULL );
bool ShowNote( const ScAddress& rPos, bool bShow = true );
inline bool HideNote( const ScAddress& rPos ) { return ShowNote( rPos, false ); }
diff --git a/sc/source/ui/src/condfrmt.src b/sc/source/ui/src/condfrmt.src
index accbbbc..bc10d1f 100644
--- a/sc/source/ui/src/condfrmt.src
+++ b/sc/source/ui/src/condfrmt.src
@@ -391,3 +391,17 @@ ModelessDialog RID_SCDLG_CONDFORMAT
};
Text [ en-US ] = "Conditional Formatting" ;
};
+
+String LABEL_FORMARTTING_CONDITIONS
+{
+ Text [ en-US ] = "Formatting Conditions" ;
+};
+String LABEL_CONDITIONS
+{
+ Text [ en-US ] = "Conditions" ;
+};
+String LABEL_CONDITION_VALUE
+{
+ Text [ en-US ] = "Condition Value" ;
+};
+
diff --git a/sc/source/ui/src/hdrcont.src b/sc/source/ui/src/hdrcont.src
index d84a868..c541510 100644
--- a/sc/source/ui/src/hdrcont.src
+++ b/sc/source/ui/src/hdrcont.src
@@ -53,7 +53,7 @@
MenuItem\
{\
Identifier = SID_PASTE ; \
- HelpId = SID_PASTE ; \
+ HelpId = CMD_SID_PASTE ; \
Text [ en-US ] = "~Paste" ; \
};
@@ -70,13 +70,13 @@ Menu RID_POPUP_ROWHEADER
MenuItem
{
Identifier = FID_ROW_HEIGHT ;
- HelpId = FID_ROW_HEIGHT ;
+ HelpId = CMD_FID_ROW_HEIGHT ;
Text [ en-US ] = "Row Hei~ght..." ;
};
MenuItem
{
Identifier = FID_ROW_OPT_HEIGHT ;
- HelpId = FID_ROW_OPT_HEIGHT ;
+ HelpId = CMD_FID_ROW_OPT_HEIGHT ;
Text [ en-US ] = "Optimal ~Row Height..." ;
};
//------------------------------
@@ -85,19 +85,19 @@ Menu RID_POPUP_ROWHEADER
MenuItem
{
Identifier = FID_INS_ROW ;
- HelpId = FID_INS_ROW ;
+ HelpId = CMD_FID_INS_ROW ;
Text [ en-US ] = "~Insert Rows" ;
};
MenuItem
{
Identifier = SID_DEL_ROWS ;
- HelpId = SID_DEL_ROWS ;
+ HelpId = CMD_SID_DEL_ROWS ;
Text [ en-US ] = "~Delete Rows" ;
};
MenuItem
{
Identifier = SID_DELETE ;
- HelpId = SID_DELETE ;
+ HelpId = CMD_SID_DELETE ;
Text [ en-US ] = "De~lete Contents..." ;
};
//------------------------------
@@ -156,19 +156,19 @@ Menu RID_POPUP_COLHEADER
MenuItem
{
Identifier = FID_INS_COLUMN ;
- HelpId = FID_INS_COLUMN ;
+ HelpId = CMD_FID_INS_COLUMN ;
Text [ en-US ] = "~Insert Columns" ;
};
MenuItem
{
Identifier = SID_DEL_COLS ;
- HelpId = SID_DEL_COLS ;
+ HelpId = CMD_SID_DEL_COLS ;
Text [ en-US ] = "~Delete Columns" ;
};
MenuItem
{
Identifier = SID_DELETE ;
- HelpId = SID_DELETE ;
+ HelpId = CMD_SID_DELETE ;
Text [ en-US ] = "D~elete Contents..." ;
};
//------------------------------
diff --git a/sc/source/ui/src/miscdlgs.src b/sc/source/ui/src/miscdlgs.src
index 7eeac22..a13b82b 100644
--- a/sc/source/ui/src/miscdlgs.src
+++ b/sc/source/ui/src/miscdlgs.src
@@ -559,6 +559,7 @@ ModalDialog RID_SCDLG_MOVETAB
};
FixedLine FL_NAME
{
+ HelpID = "sc:CheckBox:RID_SCDLG_MOVETAB:BTN_COPY";
Pos = MAP_APPFONT ( 6 , 162 ) ;
Size = MAP_APPFONT ( 146 , 8 ) ;
Text [ en-US ] = "Name" ;
diff --git a/sc/source/ui/src/popup.src b/sc/source/ui/src/popup.src
index f12667e..01b9950 100644
--- a/sc/source/ui/src/popup.src
+++ b/sc/source/ui/src/popup.src
@@ -43,7 +43,7 @@ Menu RID_POPUP_CELLS
MenuItem
{
Identifier = SID_CELL_FORMAT_RESET ;
- HelpId = SID_CELL_FORMAT_RESET ;
+ HelpId = CMD_SID_CELL_FORMAT_RESET ;
Text [ en-US ] = "~Clear Direct Formatting" ;
};
//------------------------------
diff --git a/sc/source/ui/src/sortdlg.src b/sc/source/ui/src/sortdlg.src
index 9dd8b6f..a05c740 100644
--- a/sc/source/ui/src/sortdlg.src
+++ b/sc/source/ui/src/sortdlg.src
@@ -204,6 +204,7 @@ TabPage RID_SCPAGE_SORT_OPTIONS
};
CheckBox BTN_SORT_USER
{
+ HelpID = "sc:CheckBox:RID_SCPAGE_SORT_OPTIONS:BTN_SORT_USER";
Pos = MAP_APPFONT ( 12 , 89 ) ;
Size = MAP_APPFONT ( 242 , 10 ) ;
Text [ en-US ] = "Custom sort ~order" ;
@@ -258,6 +259,7 @@ TabPage RID_SCPAGE_SORT_OPTIONS
};
RadioButton BTN_TOP_DOWN
{
+ HelpID = "sc:RadioButton:RID_SCPAGE_SORT_OPTIONS:BTN_TOP_DOWN";
Pos = MAP_APPFONT ( 12 , 158 ) ;
Size = MAP_APPFONT ( 242 , 10 ) ;
Text [ en-US ] = "~Top to bottom (sort rows)" ;
@@ -265,6 +267,7 @@ TabPage RID_SCPAGE_SORT_OPTIONS
};
RadioButton BTN_LEFT_RIGHT
{
+ HelpID = "sc:RadioButton:RID_SCPAGE_SORT_OPTIONS:BTN_LEFT_RIGHT";
Pos = MAP_APPFONT ( 12 , 172 ) ;
Size = MAP_APPFONT ( 242 , 10 ) ;
Text [ en-US ] = "L~eft to right (sort columns)" ;
diff --git a/sc/source/ui/src/toolbox.src b/sc/source/ui/src/toolbox.src
index 769e37d..e110dc5 100644
--- a/sc/source/ui/src/toolbox.src
+++ b/sc/source/ui/src/toolbox.src
@@ -122,133 +122,6 @@ String SCSTR_QHELP_BTNEQUAL
Text [ en-US ] = "Function" ;
};
- // --------------------------------------------------------------------
- // PopUp's fuer Werkzeugleiste
- // --------------------------------------------------------------------
-
-FloatingWindow RID_TBXCTL_INSERT
-{
- Moveable = TRUE ;
- Closeable = TRUE ;
- Hide = TRUE ;
- SVLook = TRUE ;
- HelpID = RID_TBXCTL_INSERT ;
- Text [ en-US ] = "Insert" ;
-
- ToolBox RID_TOOLBOX_INSERT
- {
- MenuStrings = TRUE ;
- SVLook = TRUE ;
- HelpID = RID_TOOLBOX_INSERT ;
- ItemList =
- {
- ToolBoxItem
- {
- Identifier = SID_INSERT_GRAPHIC ;
- HelpID = SID_INSERT_GRAPHIC ;
- };
- ToolBoxItem
- {
- Identifier = SID_CHARMAP ;
- HelpId = SID_CHARMAP ;
- };
- };
- };
-};
-
-FloatingWindow RID_TBXCTL_INSCELLS
-{
- Moveable = TRUE ;
- Closeable = TRUE ;
- Hide = TRUE ;
- SVLook = TRUE ;
- HelpID = RID_TBXCTL_INSCELLS ;
- Text [ en-US ] = "Insert Cells" ;
-
- ToolBox RID_TOOLBOX_INSCELLS
- {
- MenuStrings = TRUE ;
- SVLook = TRUE ;
- HelpID = RID_TOOLBOX_INSCELLS ;
- ItemList =
- {
- ToolBoxItem
- {
- Identifier = FID_INS_CELLSDOWN ;
- HelpId = FID_INS_CELLSDOWN ;
- };
- ToolBoxItem
- {
- Identifier = FID_INS_CELLSRIGHT ;
- HelpId = FID_INS_CELLSRIGHT ;
- };
- ToolBoxItem
- {
- Identifier = FID_INS_ROW ;
- HelpId = FID_INS_ROW ;
- };
- ToolBoxItem
- {
- Identifier = FID_INS_COLUMN ;
- HelpId = FID_INS_COLUMN ;
- };
- };
- };
-};
-
-FloatingWindow RID_TBXCTL_INSOBJ
-{
- Moveable = TRUE ;
- Closeable = TRUE ;
- Hide = TRUE ;
- SVLook = TRUE;
- HelpID = RID_TBXCTL_INSOBJ ;
- Text [ en-US ] = "Insert Object" ;
- ToolBox RID_TOOLBOX_INSOBJ
- {
- MenuStrings = TRUE ;
- SVLook = TRUE ;
- HelpID = RID_TOOLBOX_INSOBJ ;
- ItemList =
- {
- ToolBoxItem
- {
- // mit Aufziehen des Zielbereichs
- ITEM_TOOLBAR_DRAW_CHART
- };
- ToolBoxItem
- {
- Identifier = SID_INSERT_SMATH ;
- HelpId = SID_INSERT_SMATH ;
- };
- ToolBoxItem
- {
- Identifier = SID_INSERT_FLOATINGFRAME ;
- HelpID = SID_INSERT_FLOATINGFRAME ;
- };
- ToolBoxItem
- {
- Identifier = SID_INSERT_OBJECT ;
- HelpId = SID_INSERT_OBJECT ;
- };
-#ifdef SOLAR_PLUGIN
- ToolBoxItem
- {
- Identifier = SID_INSERT_PLUGIN ;
- HelpId = SID_INSERT_PLUGIN ;
- };
-#endif
-#ifdef SOLAR_JAVA
- ToolBoxItem
- {
- Identifier = SID_INSERT_APPLET ;
- HelpId = SID_INSERT_APPLET ;
- };
-#endif
- };
- };
-};
-
// Don't use this image list for normal toolbar images. We have now our commandimagelist
// folder in default_images. This list is now only used for special toolboxes that are
// used in floating windows.
diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx
index 564f8c1..edcea1b 100644
--- a/sc/source/ui/unoobj/appluno.cxx
+++ b/sc/source/ui/unoobj/appluno.cxx
@@ -184,21 +184,6 @@ SC_SIMPLE_SERVICE_INFO( ScSpreadsheetSettings, "ScSpreadsheetSettings", SCSPREAD
//------------------------------------------------------------------------
-static void lcl_WriteInfo( registry::XRegistryKey* pRegistryKey,
- const rtl::OUString& rImplementationName,
- const uno::Sequence< rtl::OUString >& rServices )
- throw( registry::InvalidRegistryException )
-{
- rtl::OUString aImpl(RTL_CONSTASCII_USTRINGPARAM( "/" ));
- aImpl += rImplementationName;
- aImpl += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" ));
- uno::Reference<registry::XRegistryKey> xNewKey(pRegistryKey->createKey(aImpl));
-
- const rtl::OUString* pArray = rServices.getConstArray();
- for( sal_Int32 i = 0; i < rServices.getLength(); i++ )
- xNewKey->createKey( pArray[i]);
-}
-
extern "C" {
SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx
index 69720db..9095d6e 100644
--- a/sc/source/ui/unoobj/dapiuno.cxx
+++ b/sc/source/ui/unoobj/dapiuno.cxx
@@ -1400,9 +1400,9 @@ void ScDataPilotTableObj::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
const ScUpdateRefHint& rRef = static_cast< const ScUpdateRefHint& >( rHint );
if ( aRanges.UpdateReference( rRef.GetMode(), GetDocShell()->GetDocument(), rRef.GetRange(),
rRef.GetDx(), rRef.GetDy(), rRef.GetDz() ) &&
- aRanges.Count() == 1 )
+ aRanges.size() == 1 )
{
- const ScRange* pRange = aRanges.GetObject( 0 );
+ const ScRange* pRange = aRanges.front();
if ( pRange )
{
nTab = pRange->aStart.Tab();
diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx
index 6392143..e88369e 100644
--- a/sc/source/ui/unoobj/fmtuno.cxx
+++ b/sc/source/ui/unoobj/fmtuno.cxx
@@ -396,7 +396,6 @@ void SAL_CALL ScTableConditionalFormat::removeByIndex( sal_Int32 nIndex )
(*iter)->release();
aEntries.erase(iter);
- DataChanged();
}
}
@@ -407,8 +406,6 @@ void SAL_CALL ScTableConditionalFormat::clear() throw(uno::RuntimeException)
boost::bind(&ScTableConditionalEntry::release,_1));
aEntries.clear();
-
- DataChanged();
}
// XEnumerationAccess
@@ -552,9 +549,7 @@ ScTableConditionalFormat* ScTableConditionalFormat::getImplementation(
//------------------------------------------------------------------------
-ScTableConditionalEntry::ScTableConditionalEntry(ScTableConditionalFormat* pPar,
- const ScCondFormatEntryItem& aItem) :
- pParent( pPar ),
+ScTableConditionalEntry::ScTableConditionalEntry(const ScCondFormatEntryItem& aItem) :
aData( aItem )
{
// #i113668# only store the settings, keep no reference to parent object
@@ -597,8 +592,6 @@ void SAL_CALL ScTableConditionalEntry::setConditionOperator( sal_Int32 nOperator
{
SolarMutexGuard aGuard;
aData.meMode = lcl_ConditionOperatorToModeNew( nOperator );
- if (pParent)
- pParent->DataChanged();
}
rtl::OUString SAL_CALL ScTableConditionalEntry::getFormula1() throw(uno::RuntimeException)
@@ -783,7 +776,6 @@ void SAL_CALL ScTableValidationObj::setOperator( sheet::ConditionOperator nOpera
{
SolarMutexGuard aGuard;
nMode = sal::static_int_cast<sal_uInt16>( lcl_ConditionOperatorToMode( nOperator ) );
- DataChanged();
}
sal_Int32 SAL_CALL ScTableValidationObj::getConditionOperator()
@@ -798,7 +790,6 @@ void SAL_CALL ScTableValidationObj::setConditionOperator( sal_Int32 nOperator )
{
SolarMutexGuard aGuard;
nMode = sal::static_int_cast<sal_uInt16>( lcl_ConditionOperatorToModeNew( nOperator ) );
- DataChanged();
}
rtl::OUString SAL_CALL ScTableValidationObj::getFormula1() throw(uno::RuntimeException)
diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx
index 6f8893a..84ba40b 100644
--- a/sc/source/ui/unoobj/linkuno.cxx
+++ b/sc/source/ui/unoobj/linkuno.cxx
@@ -481,7 +481,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScSheetLinksObj::createEnumerat
sal_Int32 SAL_CALL ScSheetLinksObj::getCount() throw(uno::RuntimeException)
{
SolarMutexGuard aGuard;
- INT32 nCount = 0;
+ sal_Int32 nCount = 0;
if (pDocShell)
{
ScStrCollection aNames; // um doppelte wegzulassen
@@ -1020,7 +1020,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScAreaLinksObj::createEnumerati
sal_Int32 SAL_CALL ScAreaLinksObj::getCount() throw(uno::RuntimeException)
{
SolarMutexGuard aGuard;
- INT32 nAreaCount = 0;
+ sal_Int32 nAreaCount = 0;
if (pDocShell)
{
sfx2::LinkManager* pLinkManager = pDocShell->GetDocument()->GetLinkManager();
@@ -1346,7 +1346,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScDDELinksObj::createEnumeratio
sal_Int32 SAL_CALL ScDDELinksObj::getCount() throw(uno::RuntimeException)
{
SolarMutexGuard aGuard;
- INT32 nAreaCount = 0;
+ sal_Int32 nAreaCount = 0;
if (pDocShell)
nAreaCount = pDocShell->GetDocument()->GetDdeLinkCount();
return nAreaCount;
diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx
index c19bde3..b405958 100644
--- a/sc/source/ui/unoobj/scdetect.cxx
+++ b/sc/source/ui/unoobj/scdetect.cxx
@@ -616,7 +616,7 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream )
pLotus2,
pQPro
};
- const UINT16 nFilterCount = SAL_N_ELEMENTS(ppFilterPatterns);
+ const sal_uInt16 nFilterCount = SAL_N_ELEMENTS(ppFilterPatterns);
static const sal_Char* const pFilterName[] = // zugehoerige Filter
{
diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx
index 11dc041..4554d01 100644
--- a/sc/source/ui/unoobj/styleuno.cxx
+++ b/sc/source/ui/unoobj/styleuno.cxx
@@ -492,7 +492,7 @@ sal_Bool lcl_EndsWithUser( const String& rString )
pChar[nLen-1] == ')';
}
-String ScStyleNameConversion::DisplayToProgrammaticName( const String& rDispName, UINT16 nType )
+String ScStyleNameConversion::DisplayToProgrammaticName( const String& rDispName, sal_uInt16 nType )
{
sal_Bool bDisplayIsProgrammatic = false;
@@ -522,7 +522,7 @@ String ScStyleNameConversion::DisplayToProgrammaticName( const String& rDispName
return rDispName;
}
-String ScStyleNameConversion::ProgrammaticToDisplayName( const String& rProgName, UINT16 nType )
+String ScStyleNameConversion::ProgrammaticToDisplayName( const String& rProgName, sal_uInt16 nType )
{
if ( lcl_EndsWithUser( rProgName ) )
{
diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx
index 281a179..3e78f42 100644
--- a/sc/source/ui/unoobj/viewuno.cxx
+++ b/sc/source/ui/unoobj/viewuno.cxx
@@ -1552,7 +1552,7 @@ void SAL_CALL ScTabViewObj::removeActivationEventListener( const uno::Reference<
EndActivationListening();
}
-INT16 ScTabViewObj::GetZoom(void) const
+sal_Int16 ScTabViewObj::GetZoom(void) const
{
ScTabViewShell* pViewSh = GetViewShell();
if (pViewSh)
More information about the Libreoffice-commits
mailing list