You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2025/04/19 15:17:45 UTC
(openoffice) branch AOO41X updated (d99aa429e7 -> 1443d43773)
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a change to branch AOO41X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
from d99aa429e7 Update Help cursor
new 91d3f6ab34 Fix typos
new 1443d43773 Zoomslider should be visible after changing page/slide in Draw/Impress
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
main/sd/sdi/SlideSorterController.sdi | 117 ++++++++++-----------
.../ui/slidesorter/controller/SlsSlotManager.cxx | 44 ++++----
2 files changed, 80 insertions(+), 81 deletions(-)
(openoffice) 01/02: Fix typos
Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO41X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 91d3f6ab346cdb19188cc6d3641aa72fbed8284f
Author: mseidel <ms...@apache.org>
AuthorDate: Sat Apr 19 17:07:26 2025 +0200
Fix typos
---
main/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/main/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/main/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index 2e4ea3d8b1..964148c585 100644
--- a/main/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/main/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -1164,7 +1164,7 @@ void SlotManager::DuplicateSelectedSlides (SfxRequest& rRequest)
void SlotManager::ExecuteCommandAsynchronously (::std::auto_ptr<Command> pCommand)
{
- // Ownership of command is (implicitely) transferred to the queue.
+ // Ownership of command is (implicitly) transferred to the queue.
maCommandQueue.push(pCommand.get());
pCommand.release();
Application::PostUserEvent(LINK(this,SlotManager,UserEventCallback));
@@ -1308,7 +1308,7 @@ SlideExclusionState GetSlideExclusionState (model::PageEnumeration& rPageSet)
switch (eState)
{
case UNDEFINED:
- // Use the first selected page to set the inital value.
+ // Use the first selected page to set the initial value.
eState = bState ? EXCLUDED : INCLUDED;
break;
@@ -1339,4 +1339,3 @@ SlideExclusionState GetSlideExclusionState (model::PageEnumeration& rPageSet)
} // end of anonymous namespace
} } } // end of namespace ::sd::slidesorter::controller
-
(openoffice) 02/02: Zoomslider should be visible after changing page/slide in Draw/Impress
Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO41X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 1443d43773abe4d9f84815ffd044e019b5698439
Author: mseidel <ms...@apache.org>
AuthorDate: Sat Apr 19 16:36:09 2025 +0200
Zoomslider should be visible after changing page/slide in Draw/Impress
This fixes Issue 121506:
https://bz.apache.org/ooo/show_bug.cgi?id=121506
(cherry picked from commit 28e3e2a882a5de8642c2f294cb32fecbf789d0b4)
---
main/sd/sdi/SlideSorterController.sdi | 117 ++++++++++-----------
.../ui/slidesorter/controller/SlsSlotManager.cxx | 41 ++++----
2 files changed, 79 insertions(+), 79 deletions(-)
diff --git a/main/sd/sdi/SlideSorterController.sdi b/main/sd/sdi/SlideSorterController.sdi
index a84de9d700..523944223c 100644
--- a/main/sd/sdi/SlideSorterController.sdi
+++ b/main/sd/sdi/SlideSorterController.sdi
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,20 +7,18 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
enum FadeEffect
{
FADE_EFFECT_NONE ,
@@ -68,7 +66,6 @@ item PresChange DiaAutoItem ;
item FadeEffect DiaEffectItem ;
item FadeSpeed DiaSpeedItem ;
-
interface SlideSorterView
{
SID_INSERTPAGE
@@ -126,7 +123,7 @@ interface SlideSorterView
ExecMethod = FuSupport ;
StateMethod = GetClipboardState ;
]
- SID_PASTE_SPECIAL // ole : no, status : ?
+ SID_PASTE_SPECIAL // ole : no, status : ?
[
ExecMethod = FuSupport ;
StateMethod = GetClipboardState ;
@@ -186,18 +183,20 @@ interface SlideSorterView
ExecMethod = ExecStatusBar ;
StateMethod = GetStatusBarState ;
]
- SID_ATTR_ZOOMSLIDER // status()
- [
- ExecMethod = ExecStatusBar ;
- StateMethod = GetStatusBarState ;
- ]
+/* #121506: Zoom slider disappears after changing page/slide in Draw/Impress
+ SID_ATTR_ZOOMSLIDER // status()
+ [
+ ExecMethod = ExecStatusBar ;
+ StateMethod = GetStatusBarState ;
+ ]
+*/
SID_RELOAD // ole : no, status : ?
[
GroupId = GID_DOCUMENT ;
ExecMethod = ExecCtrl ;
StateMethod = GetCtrlState ;
- Asynchron , AutoUpdate ,
+ Asynchron , AutoUpdate ,
MenuConfig , AccelConfig , ToolBoxConfig ;
]
SID_SEARCH_DLG // ole : no, status : ?
@@ -233,26 +232,26 @@ interface SlideSorterView
ExecMethod = FuTemporary ;
StateMethod = GetMenuState ;
]
- SID_OUTPUT_QUALITY_COLOR // ole : no, status : play rec
- [
- ExecMethod = ExecCtrl ;
- StateMethod = GetCtrlState ;
- ]
- SID_OUTPUT_QUALITY_GRAYSCALE // ole : no, status : play rec
- [
- ExecMethod = ExecCtrl ;
- StateMethod = GetCtrlState ;
- ]
- SID_OUTPUT_QUALITY_BLACKWHITE // ole : no, status : play rec
- [
- ExecMethod = ExecCtrl ;
- StateMethod = GetCtrlState ;
- ]
- SID_OUTPUT_QUALITY_CONTRAST // ole : no, status : play rec
- [
- ExecMethod = ExecCtrl ;
- StateMethod = GetCtrlState ;
- ]
+ SID_OUTPUT_QUALITY_COLOR // ole : no, status : play rec
+ [
+ ExecMethod = ExecCtrl ;
+ StateMethod = GetCtrlState ;
+ ]
+ SID_OUTPUT_QUALITY_GRAYSCALE // ole : no, status : play rec
+ [
+ ExecMethod = ExecCtrl ;
+ StateMethod = GetCtrlState ;
+ ]
+ SID_OUTPUT_QUALITY_BLACKWHITE // ole : no, status : play rec
+ [
+ ExecMethod = ExecCtrl ;
+ StateMethod = GetCtrlState ;
+ ]
+ SID_OUTPUT_QUALITY_CONTRAST // ole : no, status : play rec
+ [
+ ExecMethod = ExecCtrl ;
+ StateMethod = GetCtrlState ;
+ ]
SID_MAIL_SCROLLBODY_PAGEDOWN // ole : no, status : ?
[
ExecMethod = ExecCtrl ;
@@ -263,39 +262,39 @@ interface SlideSorterView
ExecMethod = FuSupport ;
StateMethod = GetMenuState ;
]
- SID_OPT_LOCALE_CHANGED // ole : no, status : ?
- [
- ExecMethod = ExecCtrl ;
- StateMethod = GetCtrlState ;
- ]
+ SID_OPT_LOCALE_CHANGED // ole : no, status : ?
+ [
+ ExecMethod = ExecCtrl ;
+ StateMethod = GetCtrlState ;
+ ]
- // #96090#
+ // #96090#
SID_GETUNDOSTRINGS // ole : no, status : ?
- [
- ExecMethod = FuSupport ;
- StateMethod = GetMenuState ;
- ]
+ [
+ ExecMethod = FuSupport ;
+ StateMethod = GetMenuState ;
+ ]
SID_UNDO // ole : no, status : ?
- [
- ExecMethod = FuSupport ;
- StateMethod = GetMenuState ;
- ]
+ [
+ ExecMethod = FuSupport ;
+ StateMethod = GetMenuState ;
+ ]
SID_GETREDOSTRINGS // ole : no, status : ?
- [
- ExecMethod = FuSupport ;
- StateMethod = GetMenuState ;
- ]
+ [
+ ExecMethod = FuSupport ;
+ StateMethod = GetMenuState ;
+ ]
SID_REDO // ole : no, status : ?
- [
- ExecMethod = FuSupport ;
- StateMethod = GetMenuState ;
- ]
+ [
+ ExecMethod = FuSupport ;
+ StateMethod = GetMenuState ;
+ ]
SID_MODIFYPAGE
[
ExecMethod = FuTemporary ;
StateMethod = GetMenuState ;
]
- SID_ASSIGN_LAYOUT
+ SID_ASSIGN_LAYOUT
[
ExecMethod = FuTemporary;
StateMethod = GetMenuState;
@@ -304,10 +303,10 @@ interface SlideSorterView
shell SlideSorterController
{
- import SlideSorterView[Automation];
+ import SlideSorterView[Automation];
}
shell SlideSorterViewShell
{
- import SlideSorterView[Automation];
+ import SlideSorterView[Automation];
}
diff --git a/main/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/main/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index 964148c585..5b265af252 100644
--- a/main/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/main/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,20 +7,18 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
#include "precompiled_sd.hxx"
#include <com/sun/star/presentation/XPresentation2.hpp>
@@ -435,7 +433,7 @@ void SlotManager::ExecCtrl (SfxRequest& rRequest)
// Undo-Manager leeren
mrSlideSorter.GetModel().GetDocument()->GetDocSh()->ClearUndoBuffer();
- // Normale Weiterleitung an ViewFrame zur Ausfuehrung
+ // Normale Weiterleitung an ViewFrame zur Ausführung
if (pViewShell != NULL)
pViewShell->GetViewFrame()->ExecuteSlot(rRequest);
@@ -491,7 +489,7 @@ void SlotManager::ExecCtrl (SfxRequest& rRequest)
void SlotManager::GetAttrState (SfxItemSet& rSet)
{
- // Iteratate over all items.
+ // Iterate over all items
SfxWhichIter aIter (rSet);
sal_uInt16 nWhich = aIter.FirstWhich();
while (nWhich)
@@ -564,7 +562,7 @@ void SlotManager::GetMenuState (SfxItemSet& rSet)
}
else
{
- // check if the object is in edit, than its temporarely not empty
+ // check if the object is in edit, than it's temporarily not empty
SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( pObj );
if( pTextObj )
{
@@ -608,7 +606,7 @@ void SlotManager::GetMenuState (SfxItemSet& rSet)
rSet.DisableItem (SID_SUMMARY_PAGE);
}
- // Starten der Praesentation moeglich?
+ // Starten der Präsentation möglich?
if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_PRESENTATION ) ||
SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_REHEARSE_TIMINGS ) )
{
@@ -854,17 +852,18 @@ void SlotManager::GetStatusBarState (SfxItemSet& rSet)
aLayoutStr = pFirstPage->GetLayoutName();
aLayoutStr.Erase( aLayoutStr.SearchAscii( SD_LT_SEPARATOR ) );
- }
+ }
}
rSet.Put( SfxStringItem( SID_STATUS_PAGE, aPageStr ) );
rSet.Put( SfxStringItem( SID_STATUS_LAYOUT, aLayoutStr ) );
+/* #121506: Zoom slider disappears after changing page/slide in Draw/Impress
if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_ATTR_ZOOMSLIDER ) )
{
- rSet.Put( SfxVoidItem( SID_ATTR_ZOOMSLIDER ) );
- }
-}
+ rSet.Put( SfxVoidItem( SID_ATTR_ZOOMSLIDER ) );
+ }
+} */
void SlotManager::ShowSlideShow( SfxRequest& rReq)
{
@@ -880,11 +879,11 @@ void SlotManager::ShowSlideShow( SfxRequest& rReq)
void SlotManager::RenameSlide (void)
{
- PageKind ePageKind = mrSlideSorter.GetModel().GetPageType();
- View* pDrView = &mrSlideSorter.GetView();
+ PageKind ePageKind = mrSlideSorter.GetModel().GetPageType();
+ View* pDrView = &mrSlideSorter.GetView();
- if (ePageKind==PK_STANDARD || ePageKind==PK_NOTES)
- {
+ if (ePageKind==PK_STANDARD || ePageKind==PK_NOTES)
+ {
if ( pDrView->IsTextEdit() )
{
pDrView->SdrEndTextEdit();
@@ -1179,8 +1178,8 @@ IMPL_LINK(SlotManager, UserEventCallback, void*, EMPTYARG)
if (pCommand != NULL)
{
- // The queue ownes the command that has just been removed from
- // it. Therefore it is deleted after it has been executed.
+ // The queue owns the command that has just been removed from
+ // it. Therefore it is deleted after it has been executed.
(*pCommand)();
delete pCommand;
}
@@ -1339,3 +1338,5 @@ SlideExclusionState GetSlideExclusionState (model::PageEnumeration& rPageSet)
} // end of anonymous namespace
} } } // end of namespace ::sd::slidesorter::controller
+
+/* vim: set noet sw=4 ts=4: */