diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-12-12 19:05:31 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-12-13 23:23:05 -0500 |
| commit | e873bb38c2df729d8662d1b1a13d85ad98aa6950 (patch) | |
| tree | dee99a2a144db0101dff230c3d4b73f144f89acd /sc/source/ui/inc | |
| parent | e842bf8d904bbb097893b8365fb31580178eb494 (diff) | |
bnc#791706: Support multiple selection in page fields.
This change allows selecting multiple items in page field popups in
pivot table.
Conflicts:
sc/source/ui/cctrl/checklistmenu.cxx
sc/source/ui/inc/viewdata.hxx
Change-Id: I692e13c0815211bac6da47fefd83bba18c901c5c
Diffstat (limited to 'sc/source/ui/inc')
| -rw-r--r-- | sc/source/ui/inc/checklistmenu.hxx | 1 | ||||
| -rw-r--r-- | sc/source/ui/inc/gridwin.hxx | 11 | ||||
| -rw-r--r-- | sc/source/ui/inc/viewdata.hxx | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx index 20968de33808..12922563c4df 100644 --- a/sc/source/ui/inc/checklistmenu.hxx +++ b/sc/source/ui/inc/checklistmenu.hxx @@ -227,6 +227,7 @@ public: struct Config { bool mbAllowEmptySet; + bool mbRTL; Config(); }; diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx index 4f84d438b00c..ac1eb19e1d2d 100644 --- a/sc/source/ui/inc/gridwin.hxx +++ b/sc/source/ui/inc/gridwin.hxx @@ -212,7 +212,7 @@ private: bool DoPageFieldSelection( SCCOL nCol, SCROW nRow ); bool DoAutoFilterButton( SCCOL nCol, SCROW nRow, const MouseEvent& rMEvt ); - void DoPushButton( SCCOL nCol, SCROW nRow, const MouseEvent& rMEvt ); + void DoPushPivotButton( SCCOL nCol, SCROW nRow, const MouseEvent& rMEvt, bool bButton, bool bPopup ); void DPMouseMove( const MouseEvent& rMEvt ); void DPMouseButtonUp( const MouseEvent& rMEvt ); @@ -221,10 +221,10 @@ private: /** * Check if the mouse click is on a field popup button. * - * @return bool true if the field popup menu has been launched and no - * further mouse event handling is necessary, false otherwise. + * @return true if the field popup menu has been launched and no further + * mouse event handling is necessary, false otherwise. */ - bool DPTestFieldPopupArrow(const MouseEvent& rMEvt, const ScAddress& rPos, ScDPObject* pDPObj); + bool DPTestFieldPopupArrow(const MouseEvent& rMEvt, const ScAddress& rPos, const ScAddress& rDimPos, ScDPObject* pDPObj); void DPLaunchFieldPopupMenu( const Point& rScrPos, const Size& rScrSize, const ScAddress& rPos, ScDPObject* pDPObj); @@ -353,8 +353,7 @@ public: ::com::sun::star::sheet::DataPilotFieldOrientation GetDPFieldOrientation( SCCOL nCol, SCROW nRow ) const; - void DrawButtons( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, - ScTableInfo& rTabInfo, OutputDevice* pContentDev ); + void DrawButtons( SCCOL nX1, SCCOL nX2, ScTableInfo& rTabInfo, OutputDevice* pContentDev); using Window::Draw; void Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx index 6ae8da2f8e23..f21352ba67df 100644 --- a/sc/source/ui/inc/viewdata.hxx +++ b/sc/source/ui/inc/viewdata.hxx @@ -367,8 +367,8 @@ public: sal_Bool IsFillMode() { return nFillMode == SC_FILL_FILL; } sal_uInt8 GetFillMode() { return nFillMode; } - // TRUE: Zelle ist zusammengefasst - sal_Bool GetMergeSizePixel( SCCOL nX, SCROW nY, long& rSizeXPix, long& rSizeYPix ); + // TRUE: Cell is merged + bool GetMergeSizePixel( SCCOL nX, SCROW nY, long& rSizeXPix, long& rSizeYPix ) const; sal_Bool GetPosFromPixel( long nClickX, long nClickY, ScSplitPos eWhich, SCsCOL& rPosX, SCsROW& rPosY, sal_Bool bTestMerge = sal_True, sal_Bool bRepair = false, |