diff options
Diffstat (limited to 'sd/source')
| -rw-r--r-- | sd/source/ui/animations/CustomAnimationList.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/annotations/annotationwindow.cxx | 9 | ||||
| -rw-r--r-- | sd/source/ui/func/fuinsert.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/unoidl/unomodel.cxx | 8 |
4 files changed, 12 insertions, 11 deletions
diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx index 3c67edc5c831..4f366979e20e 100644 --- a/sd/source/ui/animations/CustomAnimationList.cxx +++ b/sd/source/ui/animations/CustomAnimationList.cxx @@ -815,6 +815,8 @@ void CustomAnimationList::update() } while (mxTreeView->iter_next(*xEntry)); } + // tdf#147032 unselect what previous set_cursor may have caused to get selected as a side-effect + mxTreeView->unselect_all(); for (const auto& rEntry : aNewSelection) mxTreeView->select(*rEntry); diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index 0022b84c9625..21b3bb997ed6 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -390,8 +390,13 @@ void AnnotationWindow::DoResize() if( aTextHeight > aHeight ) { - // we need vertical scrollbars and have to reduce the width - aWidth -= mxVScrollbar->get_scroll_thickness(); + const int nThickness = mxVScrollbar->get_scroll_thickness(); + if (nThickness) + { + // we need vertical scrollbars and have to reduce the width + aWidth -= nThickness; + mpOutliner->SetPaperSize(rDevice.PixelToLogic(Size(aWidth, aHeight))); + } mxVScrollbar->set_vpolicy(VclPolicyType::ALWAYS); } else diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index 01434b40f141..d51a580ff081 100644 --- a/sd/source/ui/func/fuinsert.cxx +++ b/sd/source/ui/func/fuinsert.cxx @@ -148,7 +148,9 @@ void FuInsertGraphic::DoExecute( SfxRequest& rReq ) if (aRotation) { std::unique_ptr<weld::MessageDialog> xQueryBox(Application::CreateMessageDialog(nullptr, VclMessageType::Question,VclButtonsType::YesNo,SdResId(STR_QUERYROTATION))); - if (xQueryBox->run() == RET_YES) + // tdf#145819 Apply the rotation information if the user does NOT want to unrotate the image + // If they chose Yes we ignore the rotation + if (xQueryBox->run() == RET_NO) { GraphicNativeTransform aTransform( aGraphic ); aTransform.rotate( aRotation ); diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index 006a9cad3347..4fdae7e3cfbe 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -1882,14 +1882,6 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& r !(pPDFExtOutDevData && pPDFExtOutDevData->GetIsExportHiddenSlides()) ) return; - if (pPDFExtOutDevData) - { - // Calculate the page number in the PDF output, which may be smaller than the page number in - // case of hidden slides. - sal_Int32 nOutputPageNum = CalcOutputPageNum(pPDFExtOutDevData, mpDoc, nPageNumber); - pPDFExtOutDevData->SetCurrentPageNumber(nOutputPageNum); - } - ::sd::ClientView aView( mpDocShell, pOut ); ::tools::Rectangle aVisArea( Point(), mpDoc->GetSdPage( static_cast<sal_uInt16>(nPageNumber) - 1, ePageKind )->GetSize() ); vcl::Region aRegion( aVisArea ); |