Merge remote-tracking branch 'origin/master' into feature/gbuild_extensions

Conflicts:
	Module_tail_build.mk
	Repository.mk
	extensions/util/makefile.pmk
	postprocess/prj/build.lst
	svx/AllLangResTarget_svx.mk

17 files changed, 41 insertions, 227 deletions

diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 7e8064f781ea..c320f0c762d3 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -2605,7 +2605,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
                                 *xCompObj   >> nStringLen;
                                 if ( ( nStringLen > 1 ) && ( ( xCompObj->Tell() + nStringLen ) < nStreamLen ) )
                                 {   // i think that the OleIdentifier will follow
-                                    rtl::OString aTemp = read_uInt8s_AsOString(*xCompObj, nStringLen - 1);
+                                    rtl::OString aTemp = read_uInt8s_ToOString(*xCompObj, nStringLen - 1);
                                     aOleIdentifier = rtl::OStringToOUString(aTemp, RTL_TEXTENCODING_MS_1252);
                                 }
                             }
diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
index 6a9515d4f540..0e4129845e29 100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -267,19 +267,25 @@ SvStream& operator >> (SvStream& rIn, SdPublishingDesign& rDesign)
 
     sal_uInt16 nTemp16;
 
-    rIn.ReadByteString( rDesign.m_aDesignName, RTL_TEXTENCODING_UTF8 );
+    rDesign.m_aDesignName = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIn,
+        RTL_TEXTENCODING_UTF8);
     rIn >> nTemp16;
     rDesign.m_eMode = (HtmlPublishMode)nTemp16;
     rIn >> rDesign.m_bContentPage;
     rIn >> rDesign.m_bNotes;
     rIn >> rDesign.m_nResolution;
-    rIn.ReadByteString( rDesign.m_aCompression, RTL_TEXTENCODING_UTF8 );
+    rDesign.m_aCompression = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIn,
+        RTL_TEXTENCODING_UTF8);
     rIn >> nTemp16;
     rDesign.m_eFormat = (PublishingFormat)nTemp16;
-    rIn.ReadByteString( rDesign.m_aAuthor, RTL_TEXTENCODING_UTF8 );
-    rIn.ReadByteString( rDesign.m_aEMail, RTL_TEXTENCODING_UTF8 );
-    rIn.ReadByteString( rDesign.m_aWWW, RTL_TEXTENCODING_UTF8 );
-    rIn.ReadByteString( rDesign.m_aMisc, RTL_TEXTENCODING_UTF8 );
+    rDesign.m_aAuthor = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIn,
+        RTL_TEXTENCODING_UTF8);
+    rDesign.m_aEMail = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIn,
+        RTL_TEXTENCODING_UTF8);
+    rDesign.m_aWWW = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIn,
+        RTL_TEXTENCODING_UTF8);
+    rDesign.m_aMisc = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIn,
+        RTL_TEXTENCODING_UTF8);
     rIn >> rDesign.m_bDownload;
     rIn >> rDesign.m_bCreated;      // not used
     rIn >> rDesign.m_nButtonThema;
@@ -294,8 +300,10 @@ SvStream& operator >> (SvStream& rIn, SdPublishingDesign& rDesign)
 
     rIn >> nTemp16;
     rDesign.m_eScript = (PublishingScript)nTemp16;
-    rIn.ReadByteString( rDesign.m_aURL, RTL_TEXTENCODING_UTF8 );
-    rIn.ReadByteString( rDesign.m_aCGI, RTL_TEXTENCODING_UTF8 );
+    rDesign.m_aURL = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIn,
+        RTL_TEXTENCODING_UTF8);
+    rDesign.m_aCGI = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIn,
+        RTL_TEXTENCODING_UTF8);
 
     rIn >> rDesign.m_bAutoSlide;
     rIn >> rDesign.m_nSlideDuration;
@@ -315,18 +323,24 @@ SvStream& operator << (SvStream& rOut, const SdPublishingDesign& rDesign)
     SdIOCompat aIO(rOut, STREAM_WRITE, 0);
 
     // Name
-    rOut.WriteByteString( rDesign.m_aDesignName, RTL_TEXTENCODING_UTF8 );
+    write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, rDesign.m_aDesignName,
+        RTL_TEXTENCODING_UTF8);
 
     rOut << (sal_uInt16)rDesign.m_eMode;
     rOut << rDesign.m_bContentPage;
     rOut << rDesign.m_bNotes;
     rOut << rDesign.m_nResolution;
-    rOut.WriteByteString( rDesign.m_aCompression, RTL_TEXTENCODING_UTF8 );
+    write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, rDesign.m_aCompression,
+        RTL_TEXTENCODING_UTF8);
     rOut << (sal_uInt16)rDesign.m_eFormat;
-    rOut.WriteByteString( rDesign.m_aAuthor, RTL_TEXTENCODING_UTF8 );
-    rOut.WriteByteString( rDesign.m_aEMail, RTL_TEXTENCODING_UTF8 );
-    rOut.WriteByteString( rDesign.m_aWWW, RTL_TEXTENCODING_UTF8 );
-    rOut.WriteByteString( rDesign.m_aMisc, RTL_TEXTENCODING_UTF8 );
+    write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, rDesign.m_aAuthor,
+        RTL_TEXTENCODING_UTF8);
+    write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, rDesign.m_aEMail,
+        RTL_TEXTENCODING_UTF8);
+    write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, rDesign.m_aWWW,
+        RTL_TEXTENCODING_UTF8);
+    write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, rDesign.m_aMisc,
+        RTL_TEXTENCODING_UTF8);
     rOut << rDesign.m_bDownload;
     rOut << rDesign.m_bCreated;     // not used
     rOut << rDesign.m_nButtonThema;
@@ -340,8 +354,10 @@ SvStream& operator << (SvStream& rOut, const SdPublishingDesign& rDesign)
     rOut << rDesign.m_bUseColor;
 
     rOut << (sal_uInt16)rDesign.m_eScript;
-    rOut.WriteByteString( rDesign.m_aURL, RTL_TEXTENCODING_UTF8 );
-    rOut.WriteByteString( rDesign.m_aCGI, RTL_TEXTENCODING_UTF8 );
+    write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, rDesign.m_aURL,
+        RTL_TEXTENCODING_UTF8);
+    write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, rDesign.m_aCGI,
+        RTL_TEXTENCODING_UTF8);
 
     rOut << rDesign.m_bAutoSlide;
     rOut << rDesign.m_nSlideDuration;
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index bff23fe42516..6e7862d664ec 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -714,7 +714,7 @@ void SlideTransitionPane::updateLayout()
     aCtrlSize = maFT_SOUND.GetSizePixel();
     if( bStack )
         aUpperLeft.setY( aUpperLeft.getY() - aCtrlSize.getHeight());
-    aCtrlSize.setWidth( nFTSoundWidth );
+    aCtrlSize.setWidth( nFTSoundWidth - 2 * nOffsetX );
     maFT_SOUND.SetPosSizePixel( aUpperLeft, aCtrlSize );
 
     aUpperLeft.setX( nIndent );
@@ -728,7 +728,7 @@ void SlideTransitionPane::updateLayout()
     aCtrlSize = maFT_SPEED.GetSizePixel();
     if( bStack )
         aUpperLeft.setY( aUpperLeft.getY() - aCtrlSize.getHeight());
-    aCtrlSize.setWidth( nFTSpeedWidth );
+    aCtrlSize.setWidth( nFTSpeedWidth - 2 * nOffsetX );
     maFT_SPEED.SetPosSizePixel( aUpperLeft, aCtrlSize );
 
     // fixed line "Modify Transition"
diff --git a/sd/source/ui/app/strings.src b/sd/source/ui/app/strings.src
index 3b6b2e4d5670..1bc40bfc72a3 100644
--- a/sd/source/ui/app/strings.src
+++ b/sd/source/ui/app/strings.src
@@ -397,7 +397,7 @@ String STR_SD_PAGE
 };
 String STR_ALL_FILES
 {
-    Text [ en-US ] = "All files (*.*)" ;
+    Text [ en-US ] = "All files" ;
 };
 String STR_UNDO_INSERT_TEXTFRAME
 {
diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx
index 9d7145179ebf..f0d92c8cc993 100644
--- a/sd/source/ui/dlg/prltempl.cxx
+++ b/sd/source/ui/dlg/prltempl.cxx
@@ -102,7 +102,7 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh,
         aInputSet.Put( rStyleBase.GetItemSet() );
 
         // need parent-relationship
-        const SfxItemSet* pParentItemSet = rStyleBase.GetItemSet().GetParent();;
+        const SfxItemSet* pParentItemSet = rStyleBase.GetItemSet().GetParent();
         if( pParentItemSet )
             aInputSet.SetParent( pParentItemSet );
 
diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx
index 4286ff690b6d..7e9d54ec35b0 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 bcffd4fa12d8..290a43ebff80 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/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 1da357bfad4c..63eb11d1f673 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -80,7 +80,6 @@
 #include "rtl/ref.hxx"
 #include "slideshow.hrc"
 #include "canvas/elapsedtime.hxx"
-#include "canvas/prioritybooster.hxx"
 #include "avmedia/mediawindow.hxx"
 #include  "svtools/colrdlg.hxx"
 
diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx
index df67a539a52d..fdd01a47552e 100644
--- a/sd/source/ui/slidesorter/controller/SlsListener.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx
@@ -509,8 +509,8 @@ void SAL_CALL Listener::propertyChange (
                 // nevertheless in order to make the new current page the
                 // last recently selected page of the PageSelector.  This is
                 // used when making the selection visible.
-                mrController.GetPageSelector().SelectPage(nCurrentPage-1);
                 mrController.GetCurrentSlideManager()->NotifyCurrentSlideChange(nCurrentPage-1);
+                mrController.GetPageSelector().SelectPage(nCurrentPage-1);
             }
             catch (beans::UnknownPropertyException&)
             {
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index 57a620871708..fc5eec6eb80b 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 5e5ad8a72178..c5bdcb51675d 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 342c3d5f23c9..48898f8fc606 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/SlsButtonBar.cxx b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
index d2fa7c775982..23f98ac513b5 100644
--- a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
+++ b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
@@ -100,26 +100,6 @@ private:
 
 
 namespace {
-    /** Rectangular button bar that covers the whole width of the preview.
-    */
-    class RectangleBackgroundTheme : public ButtonBar::BackgroundTheme
-    {
-    public:
-        RectangleBackgroundTheme(
-            const ::boost::shared_ptr<Theme>& rpTheme,
-            const ::std::vector<SharedButton>& rButtons);
-        virtual ~RectangleBackgroundTheme() { }
-        virtual BitmapEx CreateBackground (
-            const OutputDevice& rTemplateDevice,
-            const bool bIsButtonDown) const;
-        virtual Point GetBackgroundLocation (void);
-        virtual Rectangle GetButtonArea (void);
-    protected:
-        virtual void Layout (void);
-    private:
-        sal_Int32 mnBarHeight;
-    };
-
     /** Button bar is composed of three images, the left and right end of
         the bar and the center image.  Buttons are only placed over the
         center image.  The center image is painted as is, it is not scaled.
@@ -826,123 +806,6 @@ Button::IconSize ButtonBar::BackgroundTheme::GetIconSize (void) const
 
 
 
-
-//===== RectangleBackgroundTheme ============================================
-
-RectangleBackgroundTheme::RectangleBackgroundTheme (
-    const ::boost::shared_ptr<Theme>& rpTheme,
-    const ::std::vector<SharedButton>& rButtons)
-    : BackgroundTheme(rpTheme, rButtons),
-      mnBarHeight(0)
-{
-}
-
-
-
-
-BitmapEx RectangleBackgroundTheme::CreateBackground (
-    const OutputDevice& rTemplateDevice,
-    const bool bIsButtonDown) const
-{
-    OSL_ASSERT(mpTheme);
-
-    // Setup background color.
-    Color aTopFillColor (mpTheme->GetGradientColor(
-        Theme::Gradient_ButtonBackground,
-        Theme::Fill1));
-    Color aTopBorderColor (mpTheme->GetGradientColor(
-        Theme::Gradient_ButtonBackground,
-        Theme::Border1));
-    Color aBottomFillColor (mpTheme->GetGradientColor(
-        Theme::Gradient_ButtonBackground,
-        Theme::Fill2));
-    Color aBottomBorderColor (mpTheme->GetGradientColor(
-        Theme::Gradient_ButtonBackground,
-        Theme::Border2));
-    if (bIsButtonDown)
-    {
-        aTopFillColor.DecreaseLuminance(50);
-        aTopBorderColor.DecreaseLuminance(50);
-        aBottomFillColor.DecreaseLuminance(50);
-        aBottomBorderColor.DecreaseLuminance(50);
-    }
-
-    const int nWidth (maPreviewBoundingBox.GetWidth()+2);
-    const int nHeight (mnBarHeight);
-    const int nCenter (nHeight / 2);
-
-    VirtualDevice aDevice (rTemplateDevice, 0, 8);
-    aDevice.SetOutputSizePixel(Size(nWidth,nHeight));
-
-    // Fill upper and lower half.
-    aDevice.SetLineColor();
-    aDevice.SetFillColor(aTopFillColor);
-    aDevice.DrawRect(Rectangle(0,0,nWidth-1,nCenter));
-    aDevice.SetFillColor(aBottomFillColor);
-    aDevice.DrawRect(Rectangle(0,nCenter,nWidth-1,nHeight-1));
-
-    // Draw border.
-    aDevice.SetFillColor();
-    aDevice.SetLineColor(aTopBorderColor);
-    aDevice.DrawLine(Point(0,nCenter),Point(0,0));
-    aDevice.DrawLine(Point(0,0), Point(nWidth-1,0));
-    aDevice.DrawLine(Point(nWidth-1,0),Point(nWidth-1,nCenter));
-    aDevice.SetLineColor(aBottomBorderColor);
-    aDevice.DrawLine(Point(0,nCenter),Point(0,nHeight-1));
-    aDevice.DrawLine(Point(0,nHeight-1), Point(nWidth-1,nHeight-1));
-    aDevice.DrawLine(Point(nWidth-1,nHeight-1),Point(nWidth-1,nCenter));
-
-    return aDevice.GetBitmapEx(Point(0,0), Size(nWidth,nHeight));
-}
-
-
-
-
-Point RectangleBackgroundTheme::GetBackgroundLocation (void)
-{
-    return Point(
-        maPreviewBoundingBox.Left()-1,
-        maPreviewBoundingBox.Bottom() - mnBarHeight + 2);
-}
-
-
-
-
-Rectangle RectangleBackgroundTheme::GetButtonArea (void)
-{
-    return Rectangle(
-        maPreviewBoundingBox.Left(),
-        maPreviewBoundingBox.Bottom() - mnBarHeight + 2,
-        maPreviewBoundingBox.Right(),
-        maPreviewBoundingBox.Bottom());
-}
-
-
-
-
-void RectangleBackgroundTheme::Layout (void)
-{
-    if (maPreviewBoundingBox.GetWidth() < maMinimumLargeButtonAreaSize.Width())
-        if (maPreviewBoundingBox.GetWidth() < maMinimumMediumButtonAreaSize.Width())
-        {
-            meIconSize = Button::IconSize_Small;
-            mnBarHeight = maMinimumSmallButtonAreaSize.Height();
-        }
-        else
-        {
-            meIconSize = Button::IconSize_Medium;
-            mnBarHeight = maMinimumMediumButtonAreaSize.Height();
-        }
-    else
-    {
-        meIconSize = Button::IconSize_Large;
-        mnBarHeight = maMinimumLargeButtonAreaSize.Height();
-    }
-}
-
-
-
-
 //===== BitmapBackgroundTheme =================================================
 
 BitmapBackgroundTheme::BitmapBackgroundTheme (
diff --git a/sd/source/ui/slidesorter/view/SlsLayouter.cxx b/sd/source/ui/slidesorter/view/SlsLayouter.cxx
index e2c9c9767767..274009f2c276 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/sd/source/ui/toolpanel/TaskPaneTreeNode.cxx b/sd/source/ui/toolpanel/TaskPaneTreeNode.cxx
index bce9a06e9ebe..3a57e814951e 100644
--- a/sd/source/ui/toolpanel/TaskPaneTreeNode.cxx
+++ b/sd/source/ui/toolpanel/TaskPaneTreeNode.cxx
@@ -99,7 +99,7 @@ sal_Int32 TreeNode::GetMinimumWidth (void)
             nTotalMinimumWidth = nMinimumWidth;
     }
 
-    return nTotalMinimumWidth;;
+    return nTotalMinimumWidth;
 }
 
 
diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx
index 33e7d57f3fc8..7d20db8adabc 100644
--- a/sd/source/ui/view/drawview.cxx
+++ b/sd/source/ui/view/drawview.cxx
@@ -542,7 +542,7 @@ void DrawView::PresPaint(const Region& rRegion)
 
 sal_Bool DrawView::IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const
 {
-    return FmFormView::IsObjMarkable(pObj, pPV);;
+    return FmFormView::IsObjMarkable(pObj, pPV);
 }
 
 /*************************************************************************
diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx
index 6f7a83cfaa67..9362c48300e7 100644
--- a/sd/source/ui/view/drtxtob.cxx
+++ b/sd/source/ui/view/drtxtob.cxx
@@ -382,7 +382,7 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet )
             {
                 if( mpView && mpView->GetTextEditOutlinerView() )
                 {
-                    EditView & rEditView = mpView->GetTextEditOutlinerView()->GetEditView();;
+                    EditView & rEditView = mpView->GetTextEditOutlinerView()->GetEditView();
                     String          aStatusVal;
                     LanguageType    nLang = LANGUAGE_NONE;
                     bool bIsLookUpWord = GetStatusValueForThesaurusFromContext( aStatusVal, nLang, rEditView );