[Libreoffice-commits] core.git: 3 commits - starmath/source svx/source sw/source
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Thu Oct 3 07:54:24 UTC 2019
starmath/source/dialog.cxx | 3 -
svx/source/dialog/svxruler.cxx | 63 --------------------------------------
sw/source/uibase/inc/numfmtlb.hxx | 1
3 files changed, 1 insertion(+), 66 deletions(-)
New commits:
commit c00de80189caa204e4d3cef60c7f56b2e8a66533
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Oct 2 19:33:16 2019 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Oct 3 09:53:11 2019 +0200
drop some unnecessary includes
Change-Id: I76eceb7eec534171420f2ac26918e44dde0dd738
Reviewed-on: https://gerrit.libreoffice.org/80078
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index e33e4d114944..3d5442fb4075 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -26,7 +26,6 @@
#include <svl/eitem.hxx>
#include <svl/intitem.hxx>
#include <svl/stritem.hxx>
-#include <vcl/combobox.hxx>
#include <vcl/event.hxx>
#include <vcl/svapp.hxx>
#include <vcl/virdev.hxx>
@@ -1930,7 +1929,7 @@ bool SmSymDefineDialog::SelectSymbol(weld::ComboBox& rComboBox,
// if there's a change of the old symbol, show only the available ones, otherwise show none
const SmSym *pOldSymbol = nullptr;
OUString aTmpOldSymbolSetName;
- if (nPos != COMBOBOX_ENTRY_NOTFOUND)
+ if (nPos != -1)
{
pOldSymbol = m_aSymbolMgrCopy.GetSymbolByName(aNormName);
aTmpOldSymbolSetName = m_xOldSymbolSets->get_active_text();
commit 13dffd2be76ad1e4911cd74f7b25485e5df02eb7
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Oct 2 17:38:08 2019 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Oct 3 09:52:52 2019 +0200
drop debugging RulerDebugWindow
Change-Id: Icf0da14e17ca023bd93ca2a94290f5bbb8289f96
Reviewed-on: https://gerrit.libreoffice.org/80068
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 5cb7769bb2df..556d3438587d 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -62,66 +62,6 @@
#define INDENT_RIGHT_MARGIN 4
#define INDENT_COUNT 3 //without the first two old values
-#ifdef DEBUG_RULER
-#include <vcl/lstbox.hxx>
-class RulerDebugWindow : public vcl::Window
-{
- ListBox aBox;
-public:
- explicit RulerDebugWindow(vcl::Window* pParent) :
- Window(pParent, WB_BORDER|WB_SIZEMOVE|WB_DIALOGCONTROL|WB_CLIPCHILDREN|WB_SYSTEMWINDOW),
- aBox(this, WB_BORDER)
- {
- Size aOutput(200, 400);
- SetOutputSizePixel(aOutput);
- aBox.SetSizePixel(aOutput);
- aBox.Show();
- Show();
- Size aParentSize(pParent->GetOutputSizePixel());
- Size aOwnSize(GetSizePixel());
- aParentSize.setWidth(aParentSize.Width() - aOwnSize.Width());
- aParentSize.setHeight(aParentSize.Height() - aOwnSize.Height());
- SetPosPixel(Point(aParentSize.Width(), aParentSize.Height()));
- }
- ~RulerDebugWindow();
-
- ListBox& GetLBox() {return aBox;}
- static void AddDebugText(const sal_Char* pDescription, const OUString& rText );
-};
-static RulerDebugWindow* pDebugWindow = 0;
-
-RulerDebugWindow::~RulerDebugWindow()
-{
- pDebugWindow = 0;
-}
-void RulerDebugWindow::AddDebugText(const sal_Char* pDescription, const OUString& rText )
-{
- if(!pDebugWindow)
- {
- vcl::Window* pParent = Application::GetFocusWindow();
- while(pParent->GetParent())
- pParent = pParent->GetParent();
- pDebugWindow = new RulerDebugWindow(pParent);
- }
- OUString sContent( OUString::createFromAscii(pDescription) );
- sContent += rText;
- sal_uInt16 nPos = pDebugWindow->GetLBox().InsertEntry(sContent);
- pDebugWindow->GetLBox().SelectEntryPos(nPos);
- pDebugWindow->GrabFocus();
-}
-
-#define ADD_DEBUG_TEXT(cDescription, sValue) \
- RulerDebugWindow::AddDebugText(cDescription, sValue);
-
-#define REMOVE_DEBUG_WINDOW \
- delete pDebugWindow; \
- pDebugWindow = 0;
-
-#else
-#define ADD_DEBUG_TEXT(cDescription, sValue)
-#define REMOVE_DEBUG_WINDOW
-#endif
-
struct SvxRuler_Impl {
std::unique_ptr<sal_uInt16[]> pPercBuf;
std::unique_ptr<sal_uInt16[]> pBlockBuf;
@@ -350,7 +290,6 @@ SvxRuler::~SvxRuler()
void SvxRuler::dispose()
{
/* Destructor ruler; release internal buffer */
- REMOVE_DEBUG_WINDOW
if(bListening)
EndListening(*pBindings);
@@ -1344,7 +1283,6 @@ long SvxRuler::GetCorrectedDragPos( bool bLeft, bool bRight )
const long lNullPix = Ruler::GetNullOffset();
long lDragPos = GetDragPos() + lNullPix;
-ADD_DEBUG_TEXT("lDragPos: ", OUString::number(lDragPos))
bool bHoriRows = bHorz && mxRulerImpl->bIsTableRows;
if((bLeft || bHoriRows) && lDragPos < nMaxLeft)
lDragPos = nMaxLeft;
@@ -1760,7 +1698,6 @@ void SvxRuler::DragBorders()
{
case RulerDragSize::Move:
{
-ADD_DEBUG_TEXT("lLastLMargin: ", OUString::number(mxRulerImpl->lLastLMargin))
if(GetDragType() == RulerType::Border)
lDiff = lPos - nDragOffset - mpBorders[nIndex].nPos;
else
commit dc98588e94f868fb7241d1f9727a2d94e57a1280
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Oct 2 17:35:21 2019 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Oct 3 09:52:31 2019 +0200
drop unnecessary include
Change-Id: I0122b989deef01f38e4fe4a1eb2d157ba01d660c
Reviewed-on: https://gerrit.libreoffice.org/80067
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/sw/source/uibase/inc/numfmtlb.hxx b/sw/source/uibase/inc/numfmtlb.hxx
index 13d9c0cc2c46..9a38706c7e91 100644
--- a/sw/source/uibase/inc/numfmtlb.hxx
+++ b/sw/source/uibase/inc/numfmtlb.hxx
@@ -19,7 +19,6 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_NUMFMTLB_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_NUMFMTLB_HXX
-#include <vcl/lstbox.hxx>
#include <vcl/weld.hxx>
#include <svl/zforlist.hxx>
#include <swdllapi.h>
More information about the Libreoffice-commits
mailing list