[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3-desktop' - 2 commits - sd/source sw/qa

[Aron Budea]

 sd/source/ui/framework/module/ViewTabBarModule.cxx |    8 --------
 sw/qa/extras/ww8export/ww8export2.cxx              |    2 +-
 2 files changed, 1 insertion(+), 9 deletions(-)

New commits:
commit 4d21af9aef590ab26e98b3ccd61453ce2e637867
Author: Aron Budea <aron.budea at collabora.com>
Date:   Fri Jun 29 13:30:35 2018 +0200

    Fix unit test
    
    After c5463b865f4096246833d2cee9cbfbae336151e5
    
    Change-Id: Iea7f566482fb1eaa183934eae8965ee302845a52

diff --git a/sw/qa/extras/ww8export/ww8export2.cxx b/sw/qa/extras/ww8export/ww8export2.cxx
index ec8b89e8ff56..e02b0c15b709 100644
--- a/sw/qa/extras/ww8export/ww8export2.cxx
+++ b/sw/qa/extras/ww8export/ww8export2.cxx
@@ -140,7 +140,7 @@ DECLARE_WW8EXPORT_TEST(testTdf70838, "tdf70838.odt")
     SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
     SwDoc* pDoc = pTextDoc->GetDocShell()->GetDoc();
     SdrPage* pPage = pDoc->getIDocumentDrawModelAccess().GetDrawModel()->GetPage(0);
-    tools::Rectangle aRect = pPage->GetObj(0)->GetSnapRect();
+    Rectangle aRect = pPage->GetObj(0)->GetSnapRect();
     CPPUNIT_ASSERT( aRect.GetHeight() > aRect.GetWidth() );
 }
 
commit 78dd2fe0b05cd9b63b2fc2a106fc3885cd9d887c
Author: Álex Puchades <alex94puchades at gmail.com>
Date:   Wed Mar 14 15:04:26 2018 +0100

    tdf#115453 Remove Master Handout tab from Views Tab Bar
    
    The Views Tab Bar has had five tabs until now (Normal, Outline, Notes, Slide
    Sorter and Master Handout). Before this commit, selecting the Master Handout
    tab and then going back to the Normal or Notes tab showed the Slide/Notes
    Master instead of the expected behaviour.
    
    This commit removes the Master Handout Tab from the Views Tab Bar, with master
    views remaining accessible through the View Menu.
    
    Reviewed-on: https://gerrit.libreoffice.org/51320
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    (cherry picked from commit 17b57caf83425d086ac8aa5c89815ed3dc3bc286)
    (cherry picked from commit d320692dcc77716df14a7f5a75be3779a5abddd4)
    
    Change-Id: I017af5f29d154386e4f0910151c478956aa0985f

diff --git a/sd/source/ui/framework/module/ViewTabBarModule.cxx b/sd/source/ui/framework/module/ViewTabBarModule.cxx
index 02a7b553b2e1..dd2f3d82d62a 100644
--- a/sd/source/ui/framework/module/ViewTabBarModule.cxx
+++ b/sd/source/ui/framework/module/ViewTabBarModule.cxx
@@ -174,14 +174,6 @@ void ViewTabBarModule::UpdateViewTabBar (const Reference<XTabBar>& rxTabBar)
             aNotesViewButton.ButtonLabel = SD_RESSTR(STR_NOTES_MODE);
             if ( ! xBar->hasTabBarButton(aNotesViewButton))
                 xBar->addTabBarButtonAfter(aNotesViewButton, aOutlineViewButton);
-
-            TabBarButton aHandoutViewButton;
-            aHandoutViewButton.ResourceId = FrameworkHelper::CreateResourceId(
-                FrameworkHelper::msHandoutViewURL,
-                xAnchor);
-            aHandoutViewButton.ButtonLabel = SD_RESSTR(STR_HANDOUT_MASTER_MODE);
-            if ( ! xBar->hasTabBarButton(aHandoutViewButton))
-                xBar->addTabBarButtonAfter(aHandoutViewButton, aNotesViewButton);
         }
     }
 }