comphelper/source/misc/random.cxx | 6 ------
include/comphelper/random.hxx | 4 ----
include/svtools/treelistbox.hxx | 2 --
include/tools/wintypes.hxx | 1 -
include/vcl/window.hxx | 5 -----
sc/source/ui/inc/anyrefdg.hxx | 13 -------------
sc/source/ui/inc/gridwin.hxx | 2 --
sc/source/ui/inc/tabview.hxx | 2 --
sc/source/ui/miscdlgs/anyrefdg.cxx | 19 -------------------
sc/source/ui/view/gridwin.cxx | 11 -----------
sc/source/ui/view/tabview.cxx | 12 ------------
svtools/source/contnr/treelistbox.cxx | 5 -----
svtools/source/inc/svimpbox.hxx | 7 -------
unusedcode.easy | 7 ++++++-
vcl/source/window/mouse.cxx | 2 +-
vcl/source/window/window.cxx | 8 --------
vcl/source/window/winproc.cxx | 4 ++--
17 files changed, 9 insertions(+), 101 deletions(-)
New commits:
commit d1d2a0bb655edc0c6b33ab8be4d6538de47329aa
Author: Caolán McNamara <caol...@redhat.com>
Date: Sun May 24 13:15:17 2015 +0100
IsInModalNonRefMode just forwards to IsInModalMode now
Change-Id: I940b70648ede6239930ba36e755994e7749b2d0b
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index f1d7a92..138a283 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -993,11 +993,6 @@ public:
*/
bool IsInModalMode() const;
- /**
- * Necessary for calc ref input handling from modal dialogs
- */
- bool IsInModalNonRefMode() const;
-
void SetActivateMode( sal_uInt16 nMode );
sal_uInt16 GetActivateMode() const;
diff --git a/vcl/source/window/mouse.cxx b/vcl/source/window/mouse.cxx
index 7a4a826..782196f 100644
--- a/vcl/source/window/mouse.cxx
+++ b/vcl/source/window/mouse.cxx
@@ -244,7 +244,7 @@ void Window::ImplGrabFocus( sal_uInt16 nFlags )
}
// If the Window is disabled, then we don't change the focus
- if ( !IsEnabled() || !IsInputEnabled() || IsInModalNonRefMode() )
+ if ( !IsEnabled() || !IsInputEnabled() || IsInModalMode() )
return;
// we only need to set the focus if it is not already set
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 827c306..8a5e8c7 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -3621,11 +3621,6 @@ bool Window::IsInModalMode() const
return
(mpWindowImpl->mpFrameWindow->mpWindowImpl->mpFrameData->mnModalMode != 0);
}
-bool Window::IsInModalNonRefMode() const
-{
- return IsInModalMode();
-}
-
void Window::ImplIncModalCount()
{
vcl::Window* pFrameWindow = mpWindowImpl->mpFrameWindow;
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 06d8fa8..d3c43b03 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -171,7 +171,7 @@ static void ImplHandleMouseHelpRequest( vcl::Window*
pChild, const Point& rMouse
nHelpMode |= HelpEventMode::BALLOON;
if ( bool(nHelpMode) )
{
- if ( pChild->IsInputEnabled() && !pChild->IsInModalNonRefMode() )
+ if ( pChild->IsInputEnabled() && !pChild->IsInModalMode() )
{
HelpEvent aHelpEvent( rMousePos, nHelpMode );
pSVData->maHelpData.mbRequestingHelp = true;
@@ -377,7 +377,7 @@ bool ImplHandleMouseEvent( vcl::Window* pWindow,
MouseNotifyEvent nSVEvent, bool
// no mouse messages to disabled windows
// #106845# if the window was disabed during capturing we have to pass
the mouse events to release capturing
- if ( pSVData->maWinData.mpCaptureWin.get() != pChild &&
(!pChild->IsEnabled() || !pChild->IsInputEnabled() ||
pChild->IsInModalNonRefMode() ) )
+ if ( pSVData->maWinData.mpCaptureWin.get() != pChild &&
(!pChild->IsEnabled() || !pChild->IsInputEnabled() || pChild->IsInModalMode() )
)
{
ImplHandleMouseFloatMode( pChild, aMousePos, nCode, nSVEvent,
bMouseLeave );
if ( nSVEvent == MouseNotifyEvent::MOUSEMOVE )
commit b8c3d5c48552a94c5b2fd3add270441b3490b125
Author: Caolán McNamara <caol...@redhat.com>
Date: Sun May 24 13:13:44 2015 +0100
drop now unused WB_REFMODE bit
Change-Id: I873063a8cf52652ca8d3c871170beeb4585de8f1
diff --git a/include/tools/wintypes.hxx b/include/tools/wintypes.hxx
index 897e635..bfd038e 100644
--- a/include/tools/wintypes.hxx
+++ b/include/tools/wintypes.hxx
@@ -171,7 +171,6 @@ WinBits const WB_DOCKABLE =
SAL_CONST_INT64(0x20000000);
WinBits const WB_AUTOVSCROLL = SAL_CONST_INT64(0x40000000);
WinBits const WB_HYPHENATION = SAL_CONST_INT64(0x800000000) |
WB_WORDBREAK;
WinBits const WB_CHILDDLGCTRL = SAL_CONST_INT64(0x100000000000);
-WinBits const WB_REFMODE = SAL_CONST_INT64(0x200000000000);
// system floating window
WinBits const WB_SYSTEMFLOATWIN = SAL_CONST_INT64(0x100000000);
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 17cb1c9..827c306 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -3623,9 +3623,6 @@ bool Window::IsInModalMode() const
bool Window::IsInModalNonRefMode() const
{
- if(mpWindowImpl->mnStyle & WB_REFMODE)
- return false;
-
return IsInModalMode();
}
commit 6240967cfc6fe17534db9a64c24113ced3f720be
Author: Caolán McNamara <caol...@redhat.com>
Date: Sun May 24 13:12:38 2015 +0100
callcatcher: update unused code
Change-Id: I1f2a94cdcd4329af68d946ff0a74ddec4ac1c590
diff --git a/comphelper/source/misc/random.cxx
b/comphelper/source/misc/random.cxx
index d8e81c5..0c6e83e 100644
--- a/comphelper/source/misc/random.cxx
+++ b/comphelper/source/misc/random.cxx
@@ -59,12 +59,6 @@ struct RandomNumberGenerator
class theRandomNumberGenerator : public rtl::Static<RandomNumberGenerator,
theRandomNumberGenerator> {};
-// re-initialises the state of the global random number generator
-void reseed(int i)
-{
- return theRandomNumberGenerator::get().global_rng.seed(i);
-}
-
// uniform ints [a,b] distribution
int uniform_int_distribution(int a, int b)
{
diff --git a/include/comphelper/random.hxx b/include/comphelper/random.hxx
index ca0d3dd..080b5d2 100644
--- a/include/comphelper/random.hxx
+++ b/include/comphelper/random.hxx
@@ -18,10 +18,6 @@ namespace comphelper
namespace rng
{
-/// reset initial seed, typically you don't call this as the initial seed is
taken from the
-// time on the first use of the distribution functions
-COMPHELPER_DLLPUBLIC void reseed(int i);
-
// note that uniform_int_distribution is inclusive of b, i.e. [a,b] while
// uniform_real_distribution is exclusive of b, i.e. [a,b), std::nextafter may
be your friend there
diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx
index b96ecd2..7a5084d 100644
--- a/include/svtools/treelistbox.hxx
+++ b/include/svtools/treelistbox.hxx
@@ -757,8 +757,6 @@ public:
SvTreeListEntry* GetEntry( const Point& rPos, bool bHit = false ) const;
- long PaintEntry(SvTreeListEntry* pEntry, long nLine,
vcl::RenderContext& rRenderContext,
- SvLBoxTabFlags nTabFlagMask =
SvLBoxTabFlags::ALL);
virtual Rectangle GetFocusRect( SvTreeListEntry*, long nLine );
// Respects indentation
virtual sal_IntPtr GetTabPos( SvTreeListEntry*, SvLBoxTab* );
diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx
index 5f717ff..cb7a087 100644
--- a/sc/source/ui/inc/anyrefdg.hxx
+++ b/sc/source/ui/inc/anyrefdg.hxx
@@ -171,19 +171,6 @@ public:
inline bool CanInputDone( bool bForced );
};
-class ScRefHdlModalImpl : public ModalDialog, public ScRefHandler
-{
-public:
-
- virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
- virtual void StateChanged( StateChangedType nStateChange )
SAL_OVERRIDE;
-protected:
- ScRefHdlModalImpl(vcl::Window* pParent, const OUString& rID,
- const OUString& rUIXMLDescription);
-
-private:
-};
-
template< class TWindow, bool bBindRef = true >
class ScRefHdlrImplBase: public TWindow, public ScRefHandler
{
diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index b4d2ef7..bfc9a9d 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -405,8 +405,6 @@ public:
void UpdateDPFromFieldPopupMenu();
bool UpdateVisibleRange();
- void SetInRefMode( bool bRefMode );
-
// #114409#
void CursorChanged();
void DrawLayerCreated();
diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx
index d7e2a2d..40a4c43 100644
--- a/sc/source/ui/inc/tabview.hxx
+++ b/sc/source/ui/inc/tabview.hxx
@@ -514,8 +514,6 @@ public:
void SetDrawBrushSet( SfxItemSet* pNew, bool bLock );
void ResetBrushDocument();
- void SetInRefMode( bool bRefMode );
-
bool ContinueOnlineSpelling();
void EnableAutoSpell( bool bEnable );
void ResetAutoSpell();
diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx
b/sc/source/ui/miscdlgs/anyrefdg.cxx
index aab5194..078d8c0 100644
--- a/sc/source/ui/miscdlgs/anyrefdg.cxx
+++ b/sc/source/ui/miscdlgs/anyrefdg.cxx
@@ -1004,23 +1004,4 @@ void ScRefHandler::RefInputDone( bool bForced )
m_aHelper.RefInputDone( bForced );
}
-ScRefHdlModalImpl::ScRefHdlModalImpl(vcl::Window* pParent, const OUString& rID,
- const OUString& rUIXMLDescription)
- : ModalDialog( pParent, rID, rUIXMLDescription)
- , ScRefHandler(dynamic_cast<Window&>(*this), NULL, true)
-{
-}
-
-bool ScRefHdlModalImpl::PreNotify( NotifyEvent& rNEvt )
-{
- ScRefHandler::preNotify( rNEvt, true );
- return ModalDialog::PreNotify( rNEvt );
-}
-
-void ScRefHdlModalImpl::StateChanged( StateChangedType nStateChange )
-{
- ModalDialog::StateChanged( nStateChange );
- ScRefHandler::stateChanged( nStateChange, true );
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index f4c7010..89d9b11 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -6543,15 +6543,4 @@ void ScGridWindow::flushOverlayManager()
xOverlayManager->flush();
}
-void ScGridWindow::SetInRefMode( bool bInRefMode )
-{
- WinBits nBits = GetStyle();
- if(bInRefMode)
- nBits |= WB_REFMODE;
- else
- nBits &= ~WB_REFMODE;
-
- SetStyle( nBits );
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index ad23cc8..5bdadfe 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -2243,18 +2243,6 @@ void ScTabView::EnableRefInput(bool bFlag)
pRowBar[SC_SPLIT_TOP]->EnableInput(bFlag,false);
}
-void ScTabView::SetInRefMode( bool bRefMode )
-{
- if(pGridWin[SC_SPLIT_BOTTOMLEFT])
- pGridWin[SC_SPLIT_BOTTOMLEFT]->SetInRefMode( bRefMode );
- if(pGridWin[SC_SPLIT_BOTTOMRIGHT])
- pGridWin[SC_SPLIT_BOTTOMRIGHT]->SetInRefMode( bRefMode );
- if(pGridWin[SC_SPLIT_TOPLEFT])
- pGridWin[SC_SPLIT_TOPLEFT]->SetInRefMode( bRefMode );
- if(pGridWin[SC_SPLIT_TOPRIGHT])
- pGridWin[SC_SPLIT_TOPRIGHT]->SetInRefMode( bRefMode );
-}
-
bool ScTabView::ContinueOnlineSpelling()
{
bool bChanged = false;
diff --git a/svtools/source/contnr/treelistbox.cxx
b/svtools/source/contnr/treelistbox.cxx
index efb9b93..9eaed19 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -2864,11 +2864,6 @@ void SvTreeListBox::InvalidateEntry(SvTreeListEntry*
pEntry)
}
}
-long SvTreeListBox::PaintEntry(SvTreeListEntry* pEntry, long nLine,
vcl::RenderContext& rRenderContext, SvLBoxTabFlags nTabFlags)
-{
- return PaintEntry1(pEntry, nLine, rRenderContext, nTabFlags);
-}
-
long SvTreeListBox::PaintEntry1(SvTreeListEntry* pEntry, long nLine,
vcl::RenderContext& rRenderContext,
SvLBoxTabFlags nTabFlags, bool bHasClipRegion)
{
diff --git a/svtools/source/inc/svimpbox.hxx b/svtools/source/inc/svimpbox.hxx
index caf4548..552cf09 100644
--- a/svtools/source/inc/svimpbox.hxx
+++ b/svtools/source/inc/svimpbox.hxx
@@ -273,7 +273,6 @@ public:
void LoseFocus();
void UpdateAll( bool bInvalidateCompleteView= true, bool bUpdateVerSBar =
true );
void SetEntryHeight( short nHeight );
- void PaintEntry(SvTreeListEntry* pEntry,
vcl::RenderContext& rRenderContext);
void InvalidateEntry( SvTreeListEntry* );
void RecalcFocusRect();
@@ -403,12 +402,6 @@ inline Point SvImpLBox::GetEntryPosition( SvTreeListEntry*
pEntry ) const
return Point( 0, GetEntryLine( pEntry ) );
}
-inline void SvImpLBox::PaintEntry(SvTreeListEntry* pEntry, vcl::RenderContext&
rRenderContext)
-{
- long nY = GetEntryLine(pEntry);
- pView->PaintEntry(pEntry, nY, rRenderContext);
-}
-
inline bool SvImpLBox::IsLineVisible( long nY ) const
{
bool bRet = true;
diff --git a/unusedcode.easy b/unusedcode.easy
index b3008e6..7f9c734 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -55,7 +55,6 @@ Test::testCopyPasteSkipEmptyConditionalFormatting()
Test::testPerf()
Test::testSharedFormulaMoveBlock()
XclXmlUtils::ToOString(XclRange const&)
-XmlTestTools::parseXml(utl::TempFile&)
apitest::XCellRangesQuery::testQueryFormulaCells()
apitest::XDataPilotDescriptor::testGetHiddenFields()
apitest::XDataPilotFieldGrouping::testCreateDateGroup()
@@ -73,6 +72,7 @@ apitest::XSpreadsheetDocument::testGetSheets()
apitest::XText::testInsertRemoveTextContent()
basegfx::tools::containsOnlyHorizontalAndVerticalEdges(basegfx::B2DPolyPolygon
const&)
canvas::createSurfaceProxyManager(boost::shared_ptr<canvas::IRenderModule>
const&)
+chart::DataBrowser::SetCellModifiedHdl(Link<void*, long> const&)
comphelper::OAccessibleImplementationAccess::setStateBit(short, bool)
comphelper::detail::ConfigurationWrapper::getGroupReadWrite(std::shared_ptr<comphelper::ConfigurationChanges>
const&, rtl::OUString const&)
comphelper::detail::ConfigurationWrapper::getLocalizedPropertyValue(rtl::OUString
const&) const
@@ -87,6 +87,7 @@ dbaui::OTableRowView::SetUpdatable(bool)
oglcanvas::CanvasHelper::drawPoint(com::sun::star::rendering::XCanvas const*,
com::sun::star::geometry::RealPoint2D const&,
com::sun::star::rendering::ViewState const&,
com::sun::star::rendering::RenderState const&)
oglcanvas::TextLayout::draw(com::sun::star::rendering::ViewState const&,
com::sun::star::rendering::RenderState const&,
com::sun::star::uno::Reference<com::sun::star::rendering::XGraphicDevice>
const&) const
oox::drawingml::TextListStyle::dump() const
+oox::xls::DefinedName::getTokens()
sc::CLBuildKernelThread::CLBuildKernelThread()
sc::CLBuildKernelThread::consume()
sc::CLBuildKernelThread::finish()
@@ -103,6 +104,10 @@ std::__cxx1998::vector<rtl::Reference<oox::xls::(anonymous
namespace)::WorkerThr
vcl::IsWindowSystemAvailable()
vcl::MapChar(vcl::_TrueTypeFont*, unsigned short, bool)
vcl::Region::IsInside(Rectangle const&) const
+vcl::RenderSettings::PushAndApply(OutputDevice&)
+vcl::Window::DrawSelectionBackground(Rectangle const&, unsigned short, bool,
bool, bool, Color*)
+vcl::Window::GetRenderSettings()
+vcl::Window::SetDoubleBuffering(bool)
vclcanvas::CanvasBitmapHelper::setData(com::sun::star::uno::Sequence<signed
char> const&, com::sun::star::rendering::IntegerBitmapLayout const&,
com::sun::star::geometry::IntegerRectangle2D const&)
vclcanvas::CanvasBitmapHelper::setPixel(com::sun::star::uno::Sequence<signed
char> const&, com::sun::star::rendering::IntegerBitmapLayout const&,
com::sun::star::geometry::IntegerPoint2D const&)
vclcanvas::CanvasHelper::drawPoint(com::sun::star::rendering::XCanvas const*,
com::sun::star::geometry::RealPoint2D const&,
com::sun::star::rendering::ViewState const&,
com::sun::star::rendering::RenderState const&)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
