More calc fixing.
Change-Id: I35e8a6e5ef7944e937c0b73ebc9986c0eaec2df4
diff --git a/sc/source/ui/condformat/colorformat.cxx b/sc/source/ui/condformat/colorformat.cxx
index 5c08ecb..37bae8c 100644
--- a/sc/source/ui/condformat/colorformat.cxx
+++ b/sc/source/ui/condformat/colorformat.cxx
@@ -137,6 +137,7 @@ void ScDataBarSettingsDlg::dispose()
mpLbAxisCol.clear();
mpLbTypeMin.clear();
mpLbTypeMax.clear();
mpLbFillType.clear();
mpLbAxisPos.clear();
mpEdMin.clear();
mpEdMax.clear();
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx
index 8107692..07e3548 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -346,7 +346,7 @@ IMPL_LINK(ScConditionFrmtEntry, OnEdChanged, Edit*, pEdit)
{
ScCompiler aComp2( mpDoc, maPos );
aComp2.SetGrammar( mpDoc->GetGrammar() );
if (&maEdVal1 == pEdit)
if (maEdVal1 == pEdit)
{
OUString aFormula2 = maEdVal2->GetText();
boost::scoped_ptr<ScTokenArray> pArr2(aComp2.CompileString(aFormula2));
diff --git a/sc/source/ui/inc/colorformat.hxx b/sc/source/ui/inc/colorformat.hxx
index e5acc1d..9c0dca8 100644
--- a/sc/source/ui/inc/colorformat.hxx
+++ b/sc/source/ui/inc/colorformat.hxx
@@ -28,6 +28,7 @@ private:
VclPtr<ColorListBox> mpLbPos;
VclPtr<ColorListBox> mpLbNeg;
VclPtr<ColorListBox> mpLbFillType;
VclPtr<ColorListBox> mpLbAxisCol;
VclPtr<ListBox> mpLbTypeMin;
diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index ef9b850..26d3d91 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -136,8 +136,8 @@ class ScGridWindow : public vcl::Window, public DropTargetHelper, public DragSou
std::unique_ptr<ScNoteMarker> mpNoteMarker;
VclPtr<ScFilterListBox> pFilterBox;
VclPtr<FloatingWindow> pFilterFloat;
VclPtr<ScFilterListBox> mpFilterBox;
VclPtr<FloatingWindow> mpFilterFloat;
VclPtr<ScCheckListMenuWindow> mpAutoFilterPopup;
VclPtr<ScCheckListMenuWindow> mpDPFieldPopup;
std::unique_ptr<ScDPFieldButton> mpFilterButton;
diff --git a/sc/source/ui/miscdlgs/autofmt.cxx b/sc/source/ui/miscdlgs/autofmt.cxx
index b881e4e..f07d195 100644
--- a/sc/source/ui/miscdlgs/autofmt.cxx
+++ b/sc/source/ui/miscdlgs/autofmt.cxx
@@ -57,7 +57,7 @@
ScAutoFmtPreview::ScAutoFmtPreview(vcl::Window* pParent)
: Window(pParent)
, pCurData(NULL)
, aVD(new VirtualDevice(*this))
, aVD(*this)
, aScriptedText(*aVD.get())
, bFitWidth(false)
, mbRTL(false)
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 217cbbd..a1ab73b 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -547,7 +547,7 @@ void ScGridWindow::dispose()
mpFilterBox.disposeAndClear();
mpFilterFloat.disposeAndClear();
delete pNoteMarker;
mpNoteMarker.reset();
mpAutoFilterPopup.disposeAndClear();
mpDPFieldPopup.disposeAndClear();
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 806ac81..00c586c 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -280,7 +280,7 @@ IMPL_LINK_NOARG(ScTabView, TimerHdl)
// --- Resize ---------------------------------------------------------------------
static void lcl_SetPosSize( vcl::Window& rWindow, const Point& rPos, const Size& rSize,
long nTotalWidth, bool bLayoutRTL )
long nTotalWidth, bool bLayoutRTL )
{
Point aNewPos = rPos;
if ( bLayoutRTL )
@@ -467,7 +467,7 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, bool bInner )
Point aHSplitterPoint(nPosX + nTabSize + nSizeLt, nPosY + nSizeY);
Size aHSplitterSize(nSizeSp, nBarY);
lcl_SetPosSize(pHSplitter, aHSplitterPoint, aHSplitterSize, nTotalWidth, bLayoutRTL);
lcl_SetPosSize(*pHSplitter.get(), aHSplitterPoint, aHSplitterSize, nTotalWidth, bLayoutRTL);
Point aHScrollRightPoint(nPosX + nTabSize + nSizeLt + nSizeSp, nPosY + nSizeY);
Size aHScrollRightSize(nSizeRt, nBarY);
@@ -486,7 +486,7 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, bool bInner )
Point aHSplitterPoint(nPosX + nSizeLt, nPosY + nSizeY);
Size aHSplitterSize(nSizeSp, nScrollBarSize);
lcl_SetPosSize(pHSplitter, aHSplitterPoint, aHSplitterSize, nTotalWidth, bLayoutRTL);
lcl_SetPosSize(*pHSplitter.get(), aHSplitterPoint, aHSplitterSize, nTotalWidth, bLayoutRTL);
Point aHScrollRightPoint(nPosX + nSizeLt + nSizeSp, nPosY + nSizeY);
Size aHScrollRightSize(nSizeRt, nScrollBarSize);
