[Libreoffice-commits] .: 7 commits - chart2/source desktop/Library_migrationoo2.mk desktop/source filter/source i18nutil/inc i18nutil/source oox/source sc/source sdext/source sd/source sfx2/inc sfx2/source sw/source unotools/inc unotools/source unusedcode.easy vbahelper/inc vcl/inc vcl/source xmloff/source
Caolán McNamara
caolan at kemper.freedesktop.org
Wed Dec 21 01:31:02 PST 2011
chart2/source/view/axes/DateHelper.cxx | 15
chart2/source/view/inc/DateHelper.hxx | 1
desktop/Library_migrationoo2.mk | 1
desktop/source/migration/services/autocorrmigration.cxx | 286 -------------
desktop/source/migration/services/autocorrmigration.hxx | 105 ----
desktop/source/migration/services/migrationoo2.xml | 17
filter/source/svg/parserfragments.cxx | 8
i18nutil/inc/i18nutil/unicode.hxx | 1
i18nutil/source/utility/unicode.cxx | 6
oox/source/export/SchXMLSeriesHelper.cxx | 35 -
oox/source/export/SchXMLSeriesHelper.hxx | 5
sc/source/ui/inc/tabvwsh.hxx | 1
sc/source/ui/view/tabvwsh.cxx | 9
sd/source/ui/func/futext.cxx | 17
sd/source/ui/inc/futext.hxx | 2
sd/source/ui/slidesorter/controller/SlsSlotManager.cxx | 22 -
sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx | 2
sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx | 5
sd/source/ui/slidesorter/view/SlsLayouter.cxx | 16
sdext/source/presenter/PresenterTextView.cxx | 32 -
sdext/source/presenter/PresenterTextView.hxx | 6
sfx2/inc/sfx2/request.hxx | 1
sfx2/source/control/request.cxx | 18
sw/source/ui/inc/view.hxx | 4
sw/source/ui/lingu/hyp.cxx | 2
sw/source/ui/shells/basesh.cxx | 4
sw/source/ui/uiview/view0.cxx | 7
sw/source/ui/uiview/viewling.cxx | 9
unotools/inc/unotools/accelcfg.hxx | 3
unotools/source/config/accelcfg.cxx | 16
unotools/source/config/lingucfg.cxx | 25 -
unusedcode.easy | 13
vbahelper/inc/vbahelper/vbaaccesshelper.hxx | 3
vcl/inc/impbmp.hxx | 2
vcl/source/gdi/impbmp.cxx | 7
xmloff/source/chart/SchXMLSeriesHelper.cxx | 35 -
xmloff/source/chart/SchXMLSeriesHelper.hxx | 5
37 files changed, 17 insertions(+), 729 deletions(-)
New commits:
commit c1c3ef64bca25183979f666aef51ab2854d628d8
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Dec 21 09:26:31 2011 +0000
callcatcher: remove some unused code
diff --git a/chart2/source/view/axes/DateHelper.cxx b/chart2/source/view/axes/DateHelper.cxx
index 247e0f6..41f6aa1 100644
--- a/chart2/source/view/axes/DateHelper.cxx
+++ b/chart2/source/view/axes/DateHelper.cxx
@@ -41,25 +41,12 @@ bool DateHelper::IsInSameYear( const Date& rD1, const Date& rD2 )
{
return rD1.GetYear() == rD2.GetYear();
}
+
bool DateHelper::IsInSameMonth( const Date& rD1, const Date& rD2 )
{
return (rD1.GetYear() == rD2.GetYear())
&& (rD1.GetMonth() == rD2.GetMonth());
}
-long DateHelper::GetMonthsBetweenDates( Date aD1, Date aD2 )
-{
- Date aHelp = aD1;
- long nSign = 1;
- if( aD1 < aD2 )
- {
- aD1 = aD2;
- aD2 = aHelp;
- nSign = -1;
- }
-
- return nSign*( ( aD1.GetMonth() - aD2.GetMonth() )
- + ( aD1.GetYear() - aD2.GetYear() )*12 );
-}
Date DateHelper::GetDateSomeMonthsAway( const Date& rD, long nMonthDistance )
{
diff --git a/chart2/source/view/inc/DateHelper.hxx b/chart2/source/view/inc/DateHelper.hxx
index 7891035..427a230 100644
--- a/chart2/source/view/inc/DateHelper.hxx
+++ b/chart2/source/view/inc/DateHelper.hxx
@@ -46,7 +46,6 @@ public:
static bool IsInSameYear( const Date& rD1, const Date& rD2 );
static bool IsInSameMonth( const Date& rD1, const Date& rD2 );
- static long GetMonthsBetweenDates( Date aD1, Date aD2 );
static Date GetDateSomeMonthsAway( const Date& rD, long nMonthDistance );
static Date GetDateSomeYearsAway( const Date& rD, long nYearDistance );
static bool IsLessThanOneMonthAway( const Date& rD1, const Date& rD2 );
diff --git a/i18nutil/inc/i18nutil/unicode.hxx b/i18nutil/inc/i18nutil/unicode.hxx
index d5e72b1..24e9c63 100644
--- a/i18nutil/inc/i18nutil/unicode.hxx
+++ b/i18nutil/inc/i18nutil/unicode.hxx
@@ -44,7 +44,6 @@ class I18NUTIL_DLLPUBLIC unicode
public:
static sal_Int16 SAL_CALL getUnicodeType( const sal_Unicode ch );
- static sal_Bool SAL_CALL isUnicodeScriptType( const sal_Unicode ch, sal_Int16 type);
static sal_Int16 SAL_CALL getUnicodeScriptType( const sal_Unicode ch, ScriptTypeList *typeList = NULL, sal_Int16 unknownType = 0 );
static sal_Unicode SAL_CALL getUnicodeScriptStart(com::sun::star::i18n::UnicodeScript type);
static sal_Unicode SAL_CALL getUnicodeScriptEnd(com::sun::star::i18n::UnicodeScript type);
diff --git a/i18nutil/source/utility/unicode.cxx b/i18nutil/source/utility/unicode.cxx
index b0a97d6..00d4e80 100644
--- a/i18nutil/source/utility/unicode.cxx
+++ b/i18nutil/source/utility/unicode.cxx
@@ -324,12 +324,6 @@ unicode::getUnicodeScriptType( const sal_Unicode ch, ScriptTypeList* typeList, s
typeList[i].value : unknownType;
}
-sal_Bool SAL_CALL
-unicode::isUnicodeScriptType( const sal_Unicode ch, sal_Int16 type) {
- return ch >= UnicodeScriptType[type][UnicodeScriptTypeFrom] &&
- ch <= UnicodeScriptType[type][UnicodeScriptTypeTo];
-}
-
sal_Unicode SAL_CALL
unicode::getUnicodeScriptStart( UnicodeScript type) {
return UnicodeScriptType[type][UnicodeScriptTypeFrom];
diff --git a/oox/source/export/SchXMLSeriesHelper.cxx b/oox/source/export/SchXMLSeriesHelper.cxx
index fc6ee8b..e233b8a 100644
--- a/oox/source/export/SchXMLSeriesHelper.cxx
+++ b/oox/source/export/SchXMLSeriesHelper.cxx
@@ -187,41 +187,6 @@ bool SchXMLSeriesHelper::isCandleStickSeries(
return bRet;
}
-// static
-Reference< chart2::XDataSeries > SchXMLSeriesHelper::getFirstCandleStickSeries(
- const Reference< chart2::XDiagram > & xDiagram )
-{
- Reference< chart2::XDataSeries > xResult;
-
- try
- {
- Reference< chart2::XCoordinateSystemContainer > xCooSysCnt( xDiagram, uno::UNO_QUERY_THROW );
- Sequence< Reference< chart2::XCoordinateSystem > > aCooSysSeq( xCooSysCnt->getCoordinateSystems());
- for( sal_Int32 nCooSysIdx=0; !xResult.is() && nCooSysIdx<aCooSysSeq.getLength(); ++nCooSysIdx )
- {
- Reference< chart2::XChartTypeContainer > xCTCnt( aCooSysSeq[nCooSysIdx], uno::UNO_QUERY_THROW );
- Sequence< Reference< chart2::XChartType > > aCTSeq( xCTCnt->getChartTypes());
- for( sal_Int32 nCTIdx=0; !xResult.is() && nCTIdx<aCTSeq.getLength(); ++nCTIdx )
- {
- if( aCTSeq[nCTIdx]->getChartType().equals(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart2.CandleStickChartType"))))
- {
- Reference< chart2::XDataSeriesContainer > xSeriesCnt( aCTSeq[nCTIdx], uno::UNO_QUERY_THROW );
- Sequence< Reference< chart2::XDataSeries > > aSeriesSeq( xSeriesCnt->getDataSeries() );
- if( aSeriesSeq.getLength())
- xResult.set( aSeriesSeq[0] );
- break;
- }
- }
- }
- }
- catch( const uno::Exception & )
- {
- OSL_FAIL( "Exception caught" );
- }
- return xResult;
-}
-
//static
uno::Reference< beans::XPropertySet > SchXMLSeriesHelper::createOldAPISeriesPropertySet(
const uno::Reference< chart2::XDataSeries >& xSeries
diff --git a/oox/source/export/SchXMLSeriesHelper.hxx b/oox/source/export/SchXMLSeriesHelper.hxx
index 1fdabba..e191601 100644
--- a/oox/source/export/SchXMLSeriesHelper.hxx
+++ b/oox/source/export/SchXMLSeriesHelper.hxx
@@ -57,11 +57,6 @@ public:
::com::sun::star::frame::XModel >& xChartModel );
static ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::XDataSeries > getFirstCandleStickSeries(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::XDiagram > & xDiagram );
-
- static ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > createOldAPISeriesPropertySet(
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XDataSeries >& xSeries
diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx
index 791bbc3..05e6838 100644
--- a/sc/source/ui/inc/tabvwsh.hxx
+++ b/sc/source/ui/inc/tabvwsh.hxx
@@ -205,7 +205,6 @@ private:
DECL_LINK( SimpleRefAborted, String* );
DECL_LINK( SimpleRefChange, String* );
DECL_LINK( FormControlActivated, FmFormShell* );
- DECL_LINK( HtmlOptionsHdl, void * );
protected:
virtual void Activate(sal_Bool bMDI);
diff --git a/sc/source/ui/view/tabvwsh.cxx b/sc/source/ui/view/tabvwsh.cxx
index f25002f..5f59ada 100644
--- a/sc/source/ui/view/tabvwsh.cxx
+++ b/sc/source/ui/view/tabvwsh.cxx
@@ -99,13 +99,4 @@ SFX_IMPL_NAMED_VIEWFACTORY( ScTabViewShell, "Default" )
SFX_VIEW_REGISTRATION(ScDocShell);
}
-//------------------------------------------------------------------
-
-IMPL_LINK( ScTabViewShell, HtmlOptionsHdl, void*, EMPTYARG )
-{
- // Invalidierung, falls blinkender Text erlaubt/verboten wurde
- GetViewFrame()->GetBindings().Invalidate(SID_DRAW_TEXT_MARQUEE);
- return 0;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx
index 4286ff6..7e9d54e 100644
--- a/sd/source/ui/func/futext.cxx
+++ b/sd/source/ui/func/futext.cxx
@@ -1366,23 +1366,6 @@ void FuText::ReceiveRequest(SfxRequest& rReq)
}
}
-
-
-/*************************************************************************
-|*
-|* SpellChecker: Error-LinkHdl
-|*
-\************************************************************************/
-
-IMPL_LINK( FuText, SpellError, void *, nLang )
-{
- String aError( SvtLanguageTable::GetLanguageString( (LanguageType)(sal_uLong)nLang ) );
- ErrorHandler::HandleError(* new StringErrorInfo(
- ERRCODE_SVX_LINGU_LANGUAGENOTEXISTS, aError) );
- return 0;
-}
-
-
void FuText::DoubleClick(const MouseEvent& )
{
// Nothing to do
diff --git a/sd/source/ui/inc/futext.hxx b/sd/source/ui/inc/futext.hxx
index bcffd4f..290a43e 100644
--- a/sd/source/ui/inc/futext.hxx
+++ b/sd/source/ui/inc/futext.hxx
@@ -72,8 +72,6 @@ public:
sal_Bool DeleteDefaultText();
SdrTextObj* GetTextObj() { return static_cast< SdrTextObj* >( mxTextObj.get() ); }
- DECL_LINK(SpellError, void* );
-
virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle);
/** is called when the currenct function should be aborted. <p>
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index 57a6208..fc5eec6 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -1159,28 +1159,6 @@ void SlotManager::DuplicateSelectedSlides (SfxRequest& rRequest)
_1));
}
-IMPL_LINK(SlotManager, UserEventCallback, void*, EMPTYARG)
-{
- if ( ! maCommandQueue.empty())
- {
- Command* pCommand = maCommandQueue.front();
- maCommandQueue.pop();
-
- if (pCommand != NULL)
- {
- // The queue ownes the command that has just been removed from
- // it. Therefore it is deleted after it has been executed.
- (*pCommand)();
- delete pCommand;
- }
- }
-
- return 1;
-}
-
-
-
-
void SlotManager::ChangeSlideExclusionState (
const model::SharedPageDescriptor& rpDescriptor,
const bool bExcludeSlide)
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx
index 5e5ad8a..c5bdcb5 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx
@@ -114,8 +114,6 @@ private:
This can be the current selection or the insertion indicator.
*/
sal_Int32 GetInsertionPosition (void);
-
- DECL_LINK(UserEventCallback, void*);
};
} } } // end of namespace ::sd::slidesorter::controller
diff --git a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx
index 342c3d5..48898f8 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx
@@ -119,11 +119,6 @@ public:
const Size& rPreviewModelSize,
const sal_uInt32 nPageCount);
- /** Change the zoom factor. This does not change the general layout
- (number of columns).
- */
- void _SetZoom (Fraction nZoomFactor);
-
/** Return the number of columns.
*/
sal_Int32 GetColumnCount (void) const;
diff --git a/sd/source/ui/slidesorter/view/SlsLayouter.cxx b/sd/source/ui/slidesorter/view/SlsLayouter.cxx
index e2c9c97..274009f 100644
--- a/sd/source/ui/slidesorter/view/SlsLayouter.cxx
+++ b/sd/source/ui/slidesorter/view/SlsLayouter.cxx
@@ -372,22 +372,6 @@ bool Layouter::Rearrange (
return mpImplementation->Rearrange(rWindowSize, rPageSize, nPageCount);
}
-
-
-
-void Layouter::_SetZoom (Fraction nZoomFactor)
-{
- OSL_ASSERT(mpWindow);
-
- MapMode aMapMode (mpWindow->GetMapMode());
- aMapMode.SetScaleX (nZoomFactor);
- aMapMode.SetScaleY (nZoomFactor);
- mpWindow->SetMapMode (aMapMode);
-}
-
-
-
-
sal_Int32 Layouter::GetColumnCount (void) const
{
return mpImplementation->mnColumnCount;
diff --git a/sdext/source/presenter/PresenterTextView.cxx b/sdext/source/presenter/PresenterTextView.cxx
index 5bfbfd7..63a0f91 100644
--- a/sdext/source/presenter/PresenterTextView.cxx
+++ b/sdext/source/presenter/PresenterTextView.cxx
@@ -549,38 +549,6 @@ PresenterTextParagraph::PresenterTextParagraph (
}
}
-
-
-
-PresenterTextParagraph::PresenterTextParagraph (
- const sal_Int32 nParagraphIndex,
- const Reference<i18n::XBreakIterator>& rxBreakIterator,
- const Reference<i18n::XScriptTypeDetector>& rxScriptTypeDetector,
- const ::rtl::OUString& rsText,
- const SharedPresenterTextCaret& rpCaret)
- : msParagraphText(rsText),
- mnParagraphIndex(nParagraphIndex),
- mpCaret(rpCaret),
- mxBreakIterator(rxBreakIterator),
- mxScriptTypeDetector(rxScriptTypeDetector),
- maLines(),
- mnVerticalOffset(0),
- mnXOrigin(0),
- mnYOrigin(0),
- mnWidth(0),
- mnAscent(0),
- mnDescent(0),
- mnLineHeight(-1),
- meAdjust(style::ParagraphAdjust_LEFT),
- mnWritingMode (text::WritingMode2::LR_TB),
- mnCharacterOffset(0),
- maCells()
-{
-}
-
-
-
-
void PresenterTextParagraph::Paint (
const Reference<rendering::XCanvas>& rxCanvas,
const geometry::RealSize2D& rSize,
diff --git a/sdext/source/presenter/PresenterTextView.hxx b/sdext/source/presenter/PresenterTextView.hxx
index 062a247..32c54ca 100644
--- a/sdext/source/presenter/PresenterTextView.hxx
+++ b/sdext/source/presenter/PresenterTextView.hxx
@@ -108,12 +108,6 @@ public:
const cssu::Reference<css::i18n::XScriptTypeDetector>& rxScriptTypeDetector,
const cssu::Reference<css::text::XTextRange>& rxTextRange,
const SharedPresenterTextCaret& rpCaret);
- PresenterTextParagraph (
- const sal_Int32 nParagraphIndex,
- const cssu::Reference<css::i18n::XBreakIterator>& rxBreakIterator,
- const cssu::Reference<css::i18n::XScriptTypeDetector>& rxScriptTypeDetector,
- const ::rtl::OUString& rsText,
- const SharedPresenterTextCaret& rpCaret);
void Paint (
const cssu::Reference<css::rendering::XCanvas>& rxCanvas,
diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx
index 4e7d8f6..4445edf 100755
--- a/sw/source/ui/inc/view.hxx
+++ b/sw/source/ui/inc/view.hxx
@@ -302,8 +302,6 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
SW_DLLPRIVATE DECL_LINK( TimeoutHdl, Timer * );
SW_DLLPRIVATE DECL_LINK( UpdatePercentHdl, GraphicFilter* );
- SW_DLLPRIVATE DECL_LINK( HtmlOptionsHdl, void * );
-
SW_DLLPRIVATE DECL_LINK( FieldPopupModeEndHdl, FloatingWindow * );
inline long GetXScroll() const;
diff --git a/sw/source/ui/uiview/view0.cxx b/sw/source/ui/uiview/view0.cxx
index e3ae94e..8ff37c8 100644
--- a/sw/source/ui/uiview/view0.cxx
+++ b/sw/source/ui/uiview/view0.cxx
@@ -595,11 +595,4 @@ void SwView::ExecViewOptions(SfxRequest &rReq)
rReq.Done();
}
-IMPL_LINK( SwView, HtmlOptionsHdl, void*, EMPTYARG )
-{
- // Invalidierung, falls blinkender Text erlaubt/verboten wurde
- GetViewFrame()->GetBindings().Invalidate(SID_DRAW_TEXT_MARQUEE);
- return 0;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unotools/inc/unotools/accelcfg.hxx b/unotools/inc/unotools/accelcfg.hxx
index d18076b..04a105c 100644
--- a/unotools/inc/unotools/accelcfg.hxx
+++ b/unotools/inc/unotools/accelcfg.hxx
@@ -67,9 +67,6 @@ public:
// save the configuration to a stream, f.e. into a document
bool Commit( SvStream& rStream );
-
- // sets a single configuration item
- void SetCommand( const SvtAcceleratorConfigItem& rItem );
};
#endif
diff --git a/unotools/source/config/accelcfg.cxx b/unotools/source/config/accelcfg.cxx
index f780df1..61209f7 100644
--- a/unotools/source/config/accelcfg.cxx
+++ b/unotools/source/config/accelcfg.cxx
@@ -202,23 +202,9 @@ SvtAcceleratorConfiguration::~SvtAcceleratorConfiguration()
}
}
-void SvtAcceleratorConfiguration::SetCommand( const SvtAcceleratorConfigItem& rItem )
-{
- std::list< SvtAcceleratorConfigItem>::iterator p;
- for ( p = pImp->aList.begin(); p != pImp->aList.end(); ++p )
- if ( p->nCode == rItem.nCode && p->nModifier == rItem.nModifier )
- {
- p->aCommand = rItem.aCommand;
- return;
- }
-
- pImp->aList.push_back( rItem );
-
-}
-
String SvtAcceleratorConfiguration::GetStreamName()
{
- return String::CreateFromAscii("KeyBindings.xml");
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("KeyBindings.xml"));
}
SvStream* SvtAcceleratorConfiguration::GetDefaultStream( StreamMode nMode )
diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx
index eb4b381..27516fb 100644
--- a/unotools/source/config/lingucfg.cxx
+++ b/unotools/source/config/lingucfg.cxx
@@ -183,8 +183,7 @@ public:
sal_Bool SetProperty( sal_Int32 nPropertyHandle,
const com::sun::star::uno::Any &rValue );
- sal_Bool GetOptions( SvtLinguOptions &rOptions ) const;
- sal_Bool SetOptions( const SvtLinguOptions &rOptions );
+ const SvtLinguOptions& GetOptions() const;
sal_Bool IsReadOnly( const rtl::OUString &rPropertyName ) const;
sal_Bool IsReadOnly( sal_Int32 nPropertyHandle ) const;
@@ -556,27 +555,12 @@ sal_Bool SvtLinguConfigItem::SetProperty( sal_Int32 nPropertyHandle, const uno::
return bSucc;
}
-
-sal_Bool SvtLinguConfigItem::GetOptions( SvtLinguOptions &rOptions ) const
+const SvtLinguOptions& SvtLinguConfigItem::GetOptions() const
{
osl::MutexGuard aGuard(theSvtLinguConfigItemMutex::get());
-
- rOptions = aOpt;
- return sal_True;
+ return aOpt;
}
-
-sal_Bool SvtLinguConfigItem::SetOptions( const SvtLinguOptions &rOptions )
-{
- osl::MutexGuard aGuard(theSvtLinguConfigItemMutex::get());
-
- aOpt = rOptions;
- SetModified();
- NotifyListeners(0);
- return sal_True;
-}
-
-
sal_Bool SvtLinguConfigItem::LoadOptions( const uno::Sequence< OUString > &rProperyNames )
{
osl::MutexGuard aGuard(theSvtLinguConfigItemMutex::get());
@@ -906,7 +890,8 @@ sal_Bool SvtLinguConfig::SetProperty( sal_Int32 nPropertyHandle, const uno::Any
sal_Bool SvtLinguConfig::GetOptions( SvtLinguOptions &rOptions ) const
{
- return GetConfigItem().GetOptions( rOptions );
+ rOptions = GetConfigItem().GetOptions();
+ return sal_True;
}
sal_Bool SvtLinguConfig::IsReadOnly( const rtl::OUString &rPropertyName ) const
diff --git a/unusedcode.easy b/unusedcode.easy
index 4af564e..5e6da87 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -373,7 +373,6 @@ ScSimpleRangeList::Range::contains(ScSimpleRangeList::Range const&) const
ScStringCell::ScStringCell()
ScSubTotalDescriptorBase::GetData(ScSubTotalParam&) const
ScSubTotalDescriptorBase::PutData(ScSubTotalParam const&)
-ScTabViewShell::LinkStubHtmlOptionsHdl(void*, void*)
ScUserList::end()
ScUserList::end() const
ScValidationEntries_Impl::Insert(ScValidationData* const&, unsigned short&)
@@ -864,8 +863,6 @@ SwVbaColumn::calculateAbsoluteColumnWidth(int, com::sun::star::uno::Sequence<com
SwVbaColumn::calculateRelativeColumnWidth(double const*, double*, int)
SwVbaStyle::getOOoStyleTypeFromMSWord(int)
SwVbaTableHelper::setTableWidth(int)
-SwView::LinkStubHtmlOptionsHdl(void*, void*)
-SwView::LinkStubSpellError(void*, void*)
SwWriteTableCols::Insert(SwWriteTableCol* const&, unsigned short&)
SwWriteTableCols::Insert(SwWriteTableCol* const*, unsigned short)
SwWriteTableCols::Insert(SwWriteTableCols const*, unsigned short, unsigned short)
@@ -1628,7 +1625,6 @@ canvas::tools::mergeViewAndRenderState(com::sun::star::rendering::ViewState&, co
canvas::tools::prependToViewState(com::sun::star::rendering::ViewState&, basegfx::B2DHomMatrix const&)
canvas::tools::verifyInput(com::sun::star::geometry::RealSize2D const&, char const*, com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&, short)
canvas::tools::verifyInput(com::sun::star::rendering::FloatingPointBitmapLayout const&, char const*, com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&, short)
-chart::DateHelper::GetMonthsBetweenDates(Date, Date)
chart::EquidistantTickIter::getCurrentIndex() const
chart::EquidistantTickIter::getMaxIndex() const
chart::EquidistantTickIter::gotoIndex(int)
@@ -1783,8 +1779,6 @@ graphite2::Segment::append(graphite2::Segment const&)
graphite2::Slot::update(int, int, graphite2::Position&)
graphite2::TtfUtil::GetNameInfo(void const*, int, int, int, int, unsigned long&, unsigned long&)
graphite2::TtfUtil::GlyfLookup(unsigned short, void const*, void const*, unsigned long, unsigned long, void const*)
-jfw_plugin::VendorBase::createInstance()
-jfw_plugin::VendorBase::getJavaExePaths(int*)
jvmaccess::ClassPath::doLoadClass(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, void*, rtl::OUString const&, rtl::OUString const&)
libcdr::CDRDocument::generateSVG(WPXInputStream*, WPXString&)
libcdr::CDRInternalStream::CDRInternalStream(unsigned char const*, unsigned long)
@@ -1798,7 +1792,6 @@ linguistic::ToLower(unsigned short, short)
linguistic::ToTitle(String const&, short)
linguistic::ToUpper(String const&, short)
linguistic::ToUpper(unsigned short, short)
-migration::AutocorrectionMigration_create(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&)
nullcanvas::CanvasFont::getFontMatrix() const
nullcanvas::CanvasHelper::flush() const
nullcanvas::CanvasHelper::getPalette()
@@ -1996,7 +1989,6 @@ sax_fastparser::FastSerializerHelper::singleElement(char const*, com::sun::star:
sax_fastparser::FastSerializerHelper::startElement(char const*, ...)
sax_fastparser::FastSerializerHelper::write(float)
sd::CopyDlg::LinkStubReset(void*, void*)
-sd::FuText::LinkStubSpellError(void*, void*)
sd::LeftDrawPaneShell::RegisterInterface(SfxModule*)
sd::LeftImpressPaneShell::RegisterInterface(SfxModule*)
sd::ToolPanelPaneShell::RegisterInterface(SfxModule*)
@@ -2010,19 +2002,16 @@ sd::framework::ConfigurationClassifier::TraceResourceIdVector(char const*, std::
sd::framework::ConfigurationTracer::TraceConfiguration(com::sun::star::uno::Reference<com::sun::star::drawing::framework::XConfiguration> const&, char const*)
sd::slidesorter::cache::GenericPageCache::ReleasePreviewBitmap(SdrPage const*)
sd::slidesorter::controller::SelectionFunction::EventDescriptor::EventDescriptor(KeyEvent const&, sd::slidesorter::SlideSorter&)
-sd::slidesorter::controller::SlotManager::LinkStubUserEventCallback(void*, void*)
sd::slidesorter::model::VisualState::SetVisualStateBlend(double)
sd::slidesorter::view::(anonymous namespace)::Blend(unsigned char, unsigned char, double)
sd::slidesorter::view::(anonymous namespace)::CalculateColorChannel(double, double, double, double, double)
sd::slidesorter::view::(anonymous namespace)::PageObjectRun::GetInnerBoundingBox(sd::slidesorter::view::Layouter const&, int) const
sd::slidesorter::view::(anonymous namespace)::RectangleBackgroundTheme::RectangleBackgroundTheme(boost::shared_ptr<sd::slidesorter::view::Theme> const&, std::__debug::vector<boost::shared_ptr<sd::slidesorter::view::Button>, std::allocator<boost::shared_ptr<sd::slidesorter::view::Button> > > const&)
sd::slidesorter::view::FontProvider::GetFont(OutputDevice const&)
-sd::slidesorter::view::Layouter::_SetZoom(Fraction)
sdext::presenter::(anonymous namespace)::MoveInFromBottomAnimator::MoveInFromBottomAnimator(com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId> const&, rtl::Reference<sdext::presenter::PresenterController> const&, bool, std::__debug::vector<boost::function<void ()>, std::allocator<boost::function<void ()> > > const&, std::__debug::vector<boost::function<void ()>, std::allocator<boost::function<void ()> > > const&)
sdext::presenter::(anonymous namespace)::TransparentOverlayAnimator::TransparentOverlayAnimator(com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId> const&, rtl::Reference<sdext::presenter::PresenterController> const&, bool, std::__debug::vector<boost::function<void ()>, std::allocator<boost::function<void ()> > > const&, std::__debug::vector<boost::function<void ()>, std::allocator<boost::function<void ()> > > const&)
sdext::presenter::(anonymous namespace)::UnfoldInCenterAnimator::UnfoldInCenterAnimator(com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId> const&, rtl::Reference<sdext::presenter::PresenterController> const&, bool, std::__debug::vector<boost::function<void ()>, std::allocator<boost::function<void ()> > > const&, std::__debug::vector<boost::function<void ()>, std::allocator<boost::function<void ()> > > const&)
sdext::presenter::PresenterHorizontalScrollBar::PresenterHorizontalScrollBar(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, com::sun::star::uno::Reference<com::sun::star::awt::XWindow> const&, boost::shared_ptr<sdext::presenter::PresenterPaintManager> const&, boost::function<void (double)> const&)
-sdext::presenter::PresenterTextView::PresenterTextView(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, com::sun::star::uno::Reference<com::sun::star::rendering::XCanvas> const&)
sdr::animation::Scheduler::Reset(unsigned int)
sdr::contact::ViewContactOfPageObj::GetReferencedPage() const
sdr::contact::ViewContactOfSdrMediaObj::hasPreferredSize() const
@@ -2068,7 +2057,6 @@ std::__cxx1998::vector<CntHTTPCookie*, std::allocator<CntHTTPCookie*> >::~vector
std::__cxx1998::vector<OrderedEntry*, std::allocator<OrderedEntry*> >::~vector()
std::__cxx1998::vector<ServiceInfo*, std::allocator<ServiceInfo*> >::~vector()
std::__cxx1998::vector<SfxFilter*, std::allocator<SfxFilter*> >::~vector()
-svgi::(anonymous namespace)::appendChar(std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, char)
svt::table::TableControl::GoTo(int, int)
svx::SvxShowCharSetItem::~SvxShowCharSetItem()
svxform::DataNavigatorManager::GetChildWindowId()
@@ -2122,3 +2110,4 @@ vcl::PDFWriterImpl::drawPolyPolygon(PolyPolygon const&, int, bool)
vcl::unx::GtkPrintWrapper::print_operation_set_has_selection(_GtkPrintOperation*, int) const
vcl::unx::GtkPrintWrapper::print_operation_set_support_selection(_GtkPrintOperation*, int) const
void ScCompressedArrayIterator<int, unsigned short>::Follow<unsigned char>(ScCompressedArrayIterator<int, unsigned char> const&)
+writerfilter::TagLogger::attribute(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)
diff --git a/vcl/inc/impbmp.hxx b/vcl/inc/impbmp.hxx
index c77e906..f474a7e 100644
--- a/vcl/inc/impbmp.hxx
+++ b/vcl/inc/impbmp.hxx
@@ -74,8 +74,6 @@ public:
sal_Bool ImplCreate( const ImpBitmap& rImpBitmap, SalGraphics* pGraphics );
sal_Bool ImplCreate( const ImpBitmap& rImpBitmap, sal_uInt16 nNewBitCount );
- void ImplDestroy();
-
Size ImplGetSize() const;
Size ImplGetSourceSize() const;
void ImplSetSourceSize( const Size&);
diff --git a/vcl/source/gdi/impbmp.cxx b/vcl/source/gdi/impbmp.cxx
index 18ef5b6..2f70e77 100644
--- a/vcl/source/gdi/impbmp.cxx
+++ b/vcl/source/gdi/impbmp.cxx
@@ -94,13 +94,6 @@ sal_Bool ImpBitmap::ImplCreate( const ImpBitmap& rImpBitmap, sal_uInt16 nNewBitC
// -----------------------------------------------------------------------
-void ImpBitmap::ImplDestroy()
-{
- mpSalBitmap->Destroy();
-}
-
-// -----------------------------------------------------------------------
-
Size ImpBitmap::ImplGetSize() const
{
return mpSalBitmap->GetSize();
diff --git a/xmloff/source/chart/SchXMLSeriesHelper.cxx b/xmloff/source/chart/SchXMLSeriesHelper.cxx
index 0ec8024..4ad0ef7 100644
--- a/xmloff/source/chart/SchXMLSeriesHelper.cxx
+++ b/xmloff/source/chart/SchXMLSeriesHelper.cxx
@@ -188,41 +188,6 @@ bool SchXMLSeriesHelper::isCandleStickSeries(
return bRet;
}
-// static
-Reference< chart2::XDataSeries > SchXMLSeriesHelper::getFirstCandleStickSeries(
- const Reference< chart2::XDiagram > & xDiagram )
-{
- Reference< chart2::XDataSeries > xResult;
-
- try
- {
- Reference< chart2::XCoordinateSystemContainer > xCooSysCnt( xDiagram, uno::UNO_QUERY_THROW );
- Sequence< Reference< chart2::XCoordinateSystem > > aCooSysSeq( xCooSysCnt->getCoordinateSystems());
- for( sal_Int32 nCooSysIdx=0; !xResult.is() && nCooSysIdx<aCooSysSeq.getLength(); ++nCooSysIdx )
- {
- Reference< chart2::XChartTypeContainer > xCTCnt( aCooSysSeq[nCooSysIdx], uno::UNO_QUERY_THROW );
- Sequence< Reference< chart2::XChartType > > aCTSeq( xCTCnt->getChartTypes());
- for( sal_Int32 nCTIdx=0; !xResult.is() && nCTIdx<aCTSeq.getLength(); ++nCTIdx )
- {
- if( aCTSeq[nCTIdx]->getChartType().equals(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.CandleStickChartType" ))))
- {
- Reference< chart2::XDataSeriesContainer > xSeriesCnt( aCTSeq[nCTIdx], uno::UNO_QUERY_THROW );
- Sequence< Reference< chart2::XDataSeries > > aSeriesSeq( xSeriesCnt->getDataSeries() );
- if( aSeriesSeq.getLength())
- xResult.set( aSeriesSeq[0] );
- break;
- }
- }
- }
- }
- catch( const uno::Exception & )
- {
- OSL_FAIL( "Exception caught" );
- }
- return xResult;
-}
-
//static
uno::Reference< beans::XPropertySet > SchXMLSeriesHelper::createOldAPISeriesPropertySet(
const uno::Reference< chart2::XDataSeries >& xSeries
diff --git a/xmloff/source/chart/SchXMLSeriesHelper.hxx b/xmloff/source/chart/SchXMLSeriesHelper.hxx
index b5fc1ad..90fa620 100644
--- a/xmloff/source/chart/SchXMLSeriesHelper.hxx
+++ b/xmloff/source/chart/SchXMLSeriesHelper.hxx
@@ -57,11 +57,6 @@ public:
::com::sun::star::frame::XModel >& xChartModel );
static ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::XDataSeries > getFirstCandleStickSeries(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::XDiagram > & xDiagram );
-
- static ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > createOldAPISeriesPropertySet(
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XDataSeries >& xSeries
commit 725f7d0171985ff858af2436c553b4906bd060f6
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Dec 21 09:03:09 2011 +0000
autocorrection migration never actually used
diff --git a/desktop/Library_migrationoo2.mk b/desktop/Library_migrationoo2.mk
index 43a860b..76b2707 100644
--- a/desktop/Library_migrationoo2.mk
+++ b/desktop/Library_migrationoo2.mk
@@ -54,7 +54,6 @@ $(eval $(call gb_Library_use_externals,migrationoo2,\
$(eval $(call gb_Library_set_componentfile,migrationoo2,desktop/source/migration/services/migrationoo2))
$(eval $(call gb_Library_add_exception_objects,migrationoo2,\
- desktop/source/migration/services/autocorrmigration \
desktop/source/migration/services/basicmigration \
desktop/source/migration/services/cexports \
desktop/source/migration/services/jvmfwk \
diff --git a/desktop/source/migration/services/autocorrmigration.cxx b/desktop/source/migration/services/autocorrmigration.cxx
deleted file mode 100644
index 1dd01e4..0000000
--- a/desktop/source/migration/services/autocorrmigration.cxx
+++ /dev/null
@@ -1,275 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "autocorrmigration.hxx"
-#include <i18npool/mslangid.hxx>
-#include <tools/urlobj.hxx>
-#include <unotools/bootstrap.hxx>
-
-
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-
-
-//.........................................................................
-namespace migration
-{
-//.........................................................................
-
-
- static ::rtl::OUString sSourceSubDir = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/user/autocorr" ) );
- static ::rtl::OUString sTargetSubDir = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/user/autocorr" ) );
- static ::rtl::OUString sBaseName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/acor" ) );
- static ::rtl::OUString sSuffix = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".dat" ) );
-
-
- // =============================================================================
- // component operations
- // =============================================================================
-
- ::rtl::OUString AutocorrectionMigration_getImplementationName()
- {
- static ::rtl::OUString* pImplName = 0;
- if ( !pImplName )
- {
- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
- if ( !pImplName )
- {
- static ::rtl::OUString aImplName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.desktop.migration.Autocorrection" ) );
- pImplName = &aImplName;
- }
- }
- return *pImplName;
- }
-
- // -----------------------------------------------------------------------------
-
- Sequence< ::rtl::OUString > AutocorrectionMigration_getSupportedServiceNames()
- {
- static Sequence< ::rtl::OUString >* pNames = 0;
- if ( !pNames )
- {
- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
- if ( !pNames )
- {
- static Sequence< ::rtl::OUString > aNames(1);
- aNames.getArray()[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.migration.Autocorrection" ) );
- pNames = &aNames;
- }
- }
- return *pNames;
- }
-
- // =============================================================================
- // AutocorrectionMigration
- // =============================================================================
-
- AutocorrectionMigration::AutocorrectionMigration()
- {
- }
-
- // -----------------------------------------------------------------------------
-
- AutocorrectionMigration::~AutocorrectionMigration()
- {
- }
-
- // -----------------------------------------------------------------------------
-
- TStringVectorPtr AutocorrectionMigration::getFiles( const ::rtl::OUString& rBaseURL ) const
- {
- TStringVectorPtr aResult( new TStringVector );
- ::osl::Directory aDir( rBaseURL);
-
- if ( aDir.open() == ::osl::FileBase::E_None )
- {
- // iterate over directory content
- TStringVector aSubDirs;
- ::osl::DirectoryItem aItem;
- while ( aDir.getNextItem( aItem ) == ::osl::FileBase::E_None )
- {
- ::osl::FileStatus aFileStatus( osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileURL );
- if ( aItem.getFileStatus( aFileStatus ) == ::osl::FileBase::E_None )
- {
- if ( aFileStatus.getFileType() == ::osl::FileStatus::Directory )
- aSubDirs.push_back( aFileStatus.getFileURL() );
- else
- aResult->push_back( aFileStatus.getFileURL() );
- }
- }
-
- // iterate recursive over subfolders
- TStringVector::const_iterator aI = aSubDirs.begin();
- while ( aI != aSubDirs.end() )
- {
- TStringVectorPtr aSubResult = getFiles( *aI );
- aResult->insert( aResult->end(), aSubResult->begin(), aSubResult->end() );
- ++aI;
- }
- }
-
- return aResult;
- }
-
- // -----------------------------------------------------------------------------
-
- ::osl::FileBase::RC AutocorrectionMigration::checkAndCreateDirectory( INetURLObject& rDirURL )
- {
- ::osl::FileBase::RC aResult = ::osl::Directory::create( rDirURL.GetMainURL( INetURLObject::DECODE_TO_IURI ) );
- if ( aResult == ::osl::FileBase::E_NOENT )
- {
- INetURLObject aBaseURL( rDirURL );
- aBaseURL.removeSegment();
- checkAndCreateDirectory( aBaseURL );
- return ::osl::Directory::create( rDirURL.GetMainURL( INetURLObject::DECODE_TO_IURI ) );
- }
- else
- {
- return aResult;
- }
- }
-
- // -----------------------------------------------------------------------------
-
- void AutocorrectionMigration::copyFiles()
- {
- ::rtl::OUString sTargetDir;
- ::utl::Bootstrap::PathStatus aStatus = ::utl::Bootstrap::locateUserInstallation( sTargetDir );
- if ( aStatus == ::utl::Bootstrap::PATH_EXISTS )
- {
- sTargetDir += sTargetSubDir;
- TStringVectorPtr aFileList = getFiles( m_sSourceDir );
- TStringVector::const_iterator aI = aFileList->begin();
- while ( aI != aFileList->end() )
- {
- ::rtl::OUString sSourceLocalName = aI->copy( m_sSourceDir.getLength() );
- sal_Int32 nStart = sBaseName.getLength();
- sal_Int32 nEnd = sSourceLocalName.lastIndexOf ( sSuffix );
- ::rtl::OUString sLanguageType = sSourceLocalName.copy( nStart, nEnd - nStart );
- ::rtl::OUString sIsoName = MsLangId::convertLanguageToIsoString( (LanguageType) sLanguageType.toInt32() );
- ::rtl::OUString sTargetLocalName = sBaseName;
- sTargetLocalName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "_" ));
- sTargetLocalName += sIsoName;
- sTargetLocalName += sSuffix;
- ::rtl::OUString sTargetName = sTargetDir + sTargetLocalName;
- INetURLObject aURL( sTargetName );
- aURL.removeSegment();
- checkAndCreateDirectory( aURL );
- ::osl::FileBase::RC aResult = ::osl::File::copy( *aI, sTargetName );
- if ( aResult != ::osl::FileBase::E_None )
- {
- ::rtl::OString aMsg( "AutocorrectionMigration::copyFiles: cannot copy " );
- aMsg += ::rtl::OUStringToOString( *aI, RTL_TEXTENCODING_UTF8 ) + " to "
- + ::rtl::OUStringToOString( sTargetName, RTL_TEXTENCODING_UTF8 );
- OSL_FAIL( aMsg.getStr() );
- }
- ++aI;
- }
- }
- else
- {
- OSL_FAIL( "AutocorrectionMigration::copyFiles: no user installation!" );
- }
- }
-
- // -----------------------------------------------------------------------------
- // XServiceInfo
- // -----------------------------------------------------------------------------
-
- ::rtl::OUString AutocorrectionMigration::getImplementationName() throw (RuntimeException)
- {
- return AutocorrectionMigration_getImplementationName();
- }
-
- // -----------------------------------------------------------------------------
-
- sal_Bool AutocorrectionMigration::supportsService( const ::rtl::OUString& rServiceName ) throw (RuntimeException)
- {
- Sequence< ::rtl::OUString > aNames( getSupportedServiceNames() );
- const ::rtl::OUString* pNames = aNames.getConstArray();
- const ::rtl::OUString* pEnd = pNames + aNames.getLength();
- for ( ; pNames != pEnd && !pNames->equals( rServiceName ); ++pNames )
- ;
-
- return pNames != pEnd;
- }
-
- // -----------------------------------------------------------------------------
-
- Sequence< ::rtl::OUString > AutocorrectionMigration::getSupportedServiceNames() throw (RuntimeException)
- {
- return AutocorrectionMigration_getSupportedServiceNames();
- }
-
- // -----------------------------------------------------------------------------
- // XInitialization
- // -----------------------------------------------------------------------------
-
- void AutocorrectionMigration::initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException)
- {
- ::osl::MutexGuard aGuard( m_aMutex );
-
- const Any* pIter = aArguments.getConstArray();
- const Any* pEnd = pIter + aArguments.getLength();
- for ( ; pIter != pEnd ; ++pIter )
- {
- beans::NamedValue aValue;
- *pIter >>= aValue;
- if ( aValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "UserData" ) ) )
- {
- if ( !(aValue.Value >>= m_sSourceDir) )
- {
- OSL_FAIL( "AutocorrectionMigration::initialize: argument UserData has wrong type!" );
- }
- m_sSourceDir += sSourceSubDir;
- break;
- }
- }
- }
-
- // -----------------------------------------------------------------------------
- // XJob
- // -----------------------------------------------------------------------------
-
- Any AutocorrectionMigration::execute( const Sequence< beans::NamedValue >& )
- throw (lang::IllegalArgumentException, Exception, RuntimeException)
- {
- ::osl::MutexGuard aGuard( m_aMutex );
-
- copyFiles();
-
- return Any();
- }
-
- // -----------------------------------------------------------------------------
-
-//.........................................................................
-} // namespace migration
-//.........................................................................
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/migration/services/autocorrmigration.hxx b/desktop/source/migration/services/autocorrmigration.hxx
deleted file mode 100644
index d9ebedf..0000000
--- a/desktop/source/migration/services/autocorrmigration.hxx
+++ /dev/null
@@ -1,102 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _DESKTOP_AUTOCORRMIGRATION_HXX_
-#define _DESKTOP_AUTOCORRMIGRATION_HXX_
-
-#include "misc.hxx"
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/task/XJob.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/implbase3.hxx>
-#include <osl/mutex.hxx>
-#include <osl/file.hxx>
-
-
-class INetURLObject;
-
-
-//.........................................................................
-namespace migration
-{
-//.........................................................................
-
- ::rtl::OUString SAL_CALL AutocorrectionMigration_getImplementationName();
- ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL AutocorrectionMigration_getSupportedServiceNames();
-
-
- // =============================================================================
- // class AutocorrectionMigration
- // =============================================================================
-
- typedef ::cppu::WeakImplHelper3<
- ::com::sun::star::lang::XServiceInfo,
- ::com::sun::star::lang::XInitialization,
- ::com::sun::star::task::XJob > AutocorrectionMigration_BASE;
-
- class AutocorrectionMigration : public AutocorrectionMigration_BASE
- {
- private:
- ::osl::Mutex m_aMutex;
- ::rtl::OUString m_sSourceDir;
-
- TStringVectorPtr getFiles( const ::rtl::OUString& rBaseURL ) const;
- ::osl::FileBase::RC checkAndCreateDirectory( INetURLObject& rDirURL );
- void copyFiles();
-
- public:
- AutocorrectionMigration();
- virtual ~AutocorrectionMigration();
-
- // XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName()
- throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& rServiceName )
- throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()
- throw (::com::sun::star::uno::RuntimeException);
-
- // XInitialization
- virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )
- throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
-
- // XJob
- virtual ::com::sun::star::uno::Any SAL_CALL execute(
- const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& Arguments )
- throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException);
- };
-
-//.........................................................................
-} // namespace migration
-//.........................................................................
-
-#endif // _DESKTOP_AUTOCORRMIGRATION_HXX_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/migration/services/migrationoo2.xml b/desktop/source/migration/services/migrationoo2.xml
index 5bda732..130e85e 100644
--- a/desktop/source/migration/services/migrationoo2.xml
+++ b/desktop/source/migration/services/migrationoo2.xml
@@ -48,23 +48,6 @@ original target interfaces on queryInterface() calls.
<type>com.sun.star.lang.XTypeProvider</type>
<type>com.sun.star.uno.XComponentContext</type>
</component-description>
- <component-description>
- <author>Thomas Benisch</author>
- <name>com.sun.star.comp.desktop.migration.Autocorrection</name>
- <description>migration service for OpenOffice.org autocorrection</description>
- <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
- <language>c++</language>
- <status value="final"/>
- <supported-service>com.sun.star.migration.Autocorrection</supported-service>
- <service-dependency>...</service-dependency>
- <type>com.sun.star.beans.NamedValue</type>
- <type>com.sun.star.lang.IllegalArgumentException</type>
- <type>com.sun.star.lang.XInitialization</type>
- <type>com.sun.star.task.XJob</type>
- <type>com.sun.star.lang.XServiceInfo</type>
- <type>com.sun.star.lang.XTypeProvider</type>
- <type>com.sun.star.uno.XComponentContext</type>
- </component-description>
<project-build-dependency>unotools</project-build-dependency>
<project-build-dependency>tools</project-build-dependency>
<project-build-dependency>cppuhelper</project-build-dependency>
commit 1bac5427d6e1b3af2591291fc328d832a8b23047
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Dec 20 23:08:10 2011 +0000
SpellError doesn't need to be a [IMPL|DECL]Link
and as a side effect we can simplify, because argument is never NULL
and return is never used
diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx
index 45e4405..4e7d8f6 100755
--- a/sw/source/ui/inc/view.hxx
+++ b/sw/source/ui/inc/view.hxx
@@ -466,7 +466,7 @@ public:
long SetVScrollMax(long lMax);
long SetHScrollMax(long lMax);
- DECL_LINK( SpellError, LanguageType * );
+ void SpellError(LanguageType eLang);
sal_Bool ExecSpellPopup( const Point& rPt );
void ExecFieldPopup( const Point& rPt, sw::mark::IFieldmark *fieldBM );
diff --git a/sw/source/ui/lingu/hyp.cxx b/sw/source/ui/lingu/hyp.cxx
index 19c98ed..13e29bb 100644
--- a/sw/source/ui/lingu/hyp.cxx
+++ b/sw/source/ui/lingu/hyp.cxx
@@ -113,7 +113,7 @@ sal_Bool SwHyphWrapper::SpellContinue()
bShowError = sal_False;
PSH->Push();
PSH->ClearMark();
- pView->SpellError( &nLangError );
+ pView->SpellError( nLangError );
PSH->Combine();
}
return GetLast().is();
diff --git a/sw/source/ui/uiview/viewling.cxx b/sw/source/ui/uiview/viewling.cxx
index 1027395..397449c 100644
--- a/sw/source/ui/uiview/viewling.cxx
+++ b/sw/source/ui/uiview/viewling.cxx
@@ -346,7 +346,7 @@ void SwView::SpellStart( SvxSpellArea eWhich,
Beschreibung: Fehlermeldung beim Spelling
--------------------------------------------------------------------*/
// Der uebergebene Pointer nLang ist selbst der Wert
-IMPL_LINK( SwView, SpellError, LanguageType *, pLang )
+void SwView::SpellError(LanguageType eLang)
{
#if OSL_DEBUG_LEVEL > 1
sal_Bool bFocus = GetEditWin().HasFocus();
@@ -364,7 +364,6 @@ IMPL_LINK( SwView, SpellError, LanguageType *, pLang )
}
while( pWrtShell->ActionPend() );
}
- LanguageType eLang = pLang ? *pLang : LANGUAGE_NONE;
String aErr(SvtLanguageTable::GetLanguageString( eLang ) );
SwEditWin &rEditWin = GetEditWin();
@@ -402,7 +401,6 @@ IMPL_LINK( SwView, SpellError, LanguageType *, pLang )
GetEditWin().GrabFocus();
#endif
- return 0;
}
/*--------------------------------------------------------------------
@@ -588,8 +586,7 @@ void SwView::StartThesaurus()
if( eLang == LANGUAGE_DONTKNOW || eLang == LANGUAGE_NONE )
{
- LanguageType nLanguage = LANGUAGE_NONE;
- SpellError( &nLanguage );
+ SpellError( LANGUAGE_NONE );
return;
}
@@ -605,7 +602,7 @@ void SwView::StartThesaurus()
AbstractThesaurusDialog *pDlg = NULL;
if ( !xThes.is() || !xThes->hasLocale( SvxCreateLocale( eLang ) ) )
- SpellError( &eLang );
+ SpellError( eLang );
else
{
// create dialog
commit 60bfcc0a4af860f21a840ce47585ff9395cf28e6
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Dec 20 22:43:22 2011 +0000
callcatcher: SfxRequest::IsRecording unused for a long time
diff --git a/sfx2/inc/sfx2/request.hxx b/sfx2/inc/sfx2/request.hxx
index 7bebb73..e78fceb 100644
--- a/sfx2/inc/sfx2/request.hxx
+++ b/sfx2/inc/sfx2/request.hxx
@@ -101,7 +101,6 @@ public:
static com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > GetMacroRecorder( SfxViewFrame* pFrame=NULL );
static sal_Bool HasMacroRecorder( SfxViewFrame* pFrame=NULL );
sal_uInt16 GetCallMode() const;
- bool IsRecording() const;
void AllowRecording( sal_Bool );
sal_Bool AllowsRecording() const;
sal_Bool IsAPI() const;
diff --git a/sfx2/source/control/request.cxx b/sfx2/source/control/request.cxx
index d55afa8..5a9b341 100644
--- a/sfx2/source/control/request.cxx
+++ b/sfx2/source/control/request.cxx
@@ -870,24 +870,6 @@ sal_Bool SfxRequest::IsAPI() const
}
//--------------------------------------------------------------------
-
-
-bool SfxRequest::IsRecording() const
-
-/* [Description]
-
- Returns sal_True if this SfxRequest is to be recorded ie
- 1. Currently a macro is beeing recorded
- 2. This request is even recorded
- 3. the request did not originate from a pure API (for example BASIC),
- otherwise sal_False.
-*/
-
-{
- return ( AllowsRecording() && GetMacroRecorder().is() );
-}
-
-//--------------------------------------------------------------------
void SfxRequest::SetModifier( sal_uInt16 nModi )
{
pImp->nModifier = nModi;
diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx
index b2e23d8..d793595 100644
--- a/sw/source/ui/shells/basesh.cxx
+++ b/sw/source/ui/shells/basesh.cxx
@@ -344,7 +344,7 @@ void SwBaseShell::ExecClpbrd(SfxRequest &rReq)
rReq.Ignore();
bIgnore = sal_True;
int nRet = SwTransferable::PasteUnformatted( rSh, aDataHelper );
- if(nRet)// && rReq.IsRecording() )
+ if(nRet)
{
SfxViewFrame* pViewFrame = pView->GetViewFrame();
uno::Reference< frame::XDispatchRecorder > xRecorder =
@@ -380,7 +380,7 @@ void SwBaseShell::ExecClpbrd(SfxRequest &rReq)
rReq.Ignore();
bIgnore = sal_True;
int nRet = SwTransferable::PasteSpecial( rSh, aDataHelper, nFormatId );
- if(nRet)// && rReq.IsRecording() )
+ if(nRet)
{
SfxViewFrame* pViewFrame = pView->GetViewFrame();
uno::Reference< frame::XDispatchRecorder > xRecorder =
commit 80c7dd48a0b11e6c3009ac03283cec550785b9c5
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Dec 20 22:40:11 2011 +0000
AutocorrectionMigration is not constructable
diff --git a/desktop/source/migration/services/autocorrmigration.cxx b/desktop/source/migration/services/autocorrmigration.cxx
index cce46c5..1dd01e4 100644
--- a/desktop/source/migration/services/autocorrmigration.cxx
+++ b/desktop/source/migration/services/autocorrmigration.cxx
@@ -266,17 +266,6 @@ namespace migration
return Any();
}
- // =============================================================================
- // component operations
- // =============================================================================
-
- Reference< XInterface > SAL_CALL AutocorrectionMigration_create(
- Reference< XComponentContext > const & )
- SAL_THROW( () )
- {
- return static_cast< lang::XTypeProvider * >( new AutocorrectionMigration() );
- }
-
// -----------------------------------------------------------------------------
//.........................................................................
diff --git a/desktop/source/migration/services/autocorrmigration.hxx b/desktop/source/migration/services/autocorrmigration.hxx
index 20021ce..d9ebedf 100644
--- a/desktop/source/migration/services/autocorrmigration.hxx
+++ b/desktop/source/migration/services/autocorrmigration.hxx
@@ -49,9 +49,6 @@ namespace migration
::rtl::OUString SAL_CALL AutocorrectionMigration_getImplementationName();
::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL AutocorrectionMigration_getSupportedServiceNames();
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL AutocorrectionMigration_create(
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext )
- SAL_THROW( (::com::sun::star::uno::Exception) );
// =============================================================================
commit 650ed10bd00766f48dccb9b26d55d67eed034872
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Dec 20 22:26:58 2011 +0000
can't see why there's an appendChar here
diff --git a/filter/source/svg/parserfragments.cxx b/filter/source/svg/parserfragments.cxx
index 4edd90f..d70eaad 100644
--- a/filter/source/svg/parserfragments.cxx
+++ b/filter/source/svg/parserfragments.cxx
@@ -575,14 +575,6 @@ bool parsePaintUri( std::pair<const char*,const char*>& o_rPaintUri,
//////////////////////////////////////////////////////////////
-namespace
-{
-void appendChar( std::string& str, char character)
-{
- str.append(1,character);
-}
-}
-
bool parseXlinkHref( const char* sXlinkHref, std::string& data )
{
using namespace ::boost::spirit::classic;
commit b0df6d86e4f18877a8d548075b8d73e3d87c81fd
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Dec 20 15:41:18 2011 +0000
SfxObjectShell may not have a medium
diff --git a/vbahelper/inc/vbahelper/vbaaccesshelper.hxx b/vbahelper/inc/vbahelper/vbaaccesshelper.hxx
index 01a520c..2533b5c 100644
--- a/vbahelper/inc/vbahelper/vbaaccesshelper.hxx
+++ b/vbahelper/inc/vbahelper/vbaaccesshelper.hxx
@@ -63,7 +63,8 @@ namespace ooo
VBAHELPER_DLLPRIVATE inline bool isAlienDoc( SfxObjectShell& rDocShell, const char* pMimeType )
{
bool bRes( false );
- const SfxFilter *pFilt = rDocShell.GetMedium()->GetFilter();
+ const SfxMedium *pMedium = rDocShell.GetMedium();
+ const SfxFilter *pFilt = pMedium ? pMedium->GetFilter() : NULL;
if ( pFilt && pFilt->IsAlienFormat() )
bRes = ( pFilt->GetMimeType().compareToAscii( pMimeType ) == 0 );
return bRes;
More information about the Libreoffice-commits
mailing list