You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ar...@apache.org on 2013/10/20 21:12:44 UTC
svn commit: r1533954 - in /openoffice/trunk/main/sfx2: inc/sfx2/dinfdlg.hxx
source/dialog/dinfdlg.cxx
Author: arielch
Date: Sun Oct 20 19:12:44 2013
New Revision: 1533954
URL: http://svn.apache.org/r1533954
Log:
i123097 - Scroll all controls in a line
Modified:
openoffice/trunk/main/sfx2/inc/sfx2/dinfdlg.hxx
openoffice/trunk/main/sfx2/source/dialog/dinfdlg.cxx
Modified: openoffice/trunk/main/sfx2/inc/sfx2/dinfdlg.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/inc/sfx2/dinfdlg.hxx?rev=1533954&r1=1533953&r2=1533954&view=diff
==============================================================================
--- openoffice/trunk/main/sfx2/inc/sfx2/dinfdlg.hxx (original)
+++ openoffice/trunk/main/sfx2/inc/sfx2/dinfdlg.hxx Sun Oct 20 19:12:44 2013
@@ -440,14 +440,10 @@ struct CustomPropertyLine
CustomPropertiesTimeField m_aTimeField;
const String m_sDurationFormat;
CustomPropertiesDurationField m_aDurationField;
- CustomPropertiesEditButton m_aEditButton;
+ CustomPropertiesEditButton m_aEditButton;
CustomPropertiesYesNoButton m_aYesNoButton;
CustomPropertiesRemoveButton m_aRemoveButton;
- Point m_aDatePos;
- Point m_aTimePos;
- Size m_aDateTimeSize;
-
bool m_bIsRemoved;
bool m_bTypeLostFocus;
@@ -471,6 +467,9 @@ private:
CustomPropertiesYesNoButton m_aYesNoButton;
ImageButton m_aRemoveButton;
+ long m_nDatePosX;
+ long m_nTimePosX;
+
sal_Int32 m_nLineHeight;
sal_Int32 m_nScrollPos;
SvtSysLocale m_aSysLocale;
Modified: openoffice/trunk/main/sfx2/source/dialog/dinfdlg.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/source/dialog/dinfdlg.cxx?rev=1533954&r1=1533953&r2=1533954&view=diff
==============================================================================
--- openoffice/trunk/main/sfx2/source/dialog/dinfdlg.cxx (original)
+++ openoffice/trunk/main/sfx2/source/dialog/dinfdlg.cxx Sun Oct 20 19:12:44 2013
@@ -1847,8 +1847,9 @@ IMPL_LINK( CustomPropertiesWindow, TypeH
}
else if( nType == CUSTOM_TYPE_DATETIME)
{
- pLine->m_aDateField.SetPosSizePixel( pLine->m_aDatePos, pLine->m_aDateTimeSize );
- pLine->m_aTimeField.SetPosSizePixel(pLine->m_aTimePos, pLine->m_aDateTimeSize );
+ const long nPosY( pLine->m_aDateField.GetPosPixel().Y() );
+ pLine->m_aDateField.SetPosPixel( ::Point( m_nDatePosX, nPosY ) );
+ pLine->m_aTimeField.SetPosPixel( ::Point( m_nTimePosX, nPosY ) );
}
return 0;
@@ -1871,10 +1872,15 @@ IMPL_LINK( CustomPropertiesWindow, Remov
if ( pLine->m_bIsRemoved )
continue;
- Window* pWindows[] = { &pLine->m_aNameBox, &pLine->m_aTypeBox, &pLine->m_aValueEdit,
- &pLine->m_aDateField, &pLine->m_aTimeField,
- &pLine->m_aDurationField, &pLine->m_aEditButton,
- &pLine->m_aYesNoButton, &pLine->m_aRemoveButton, NULL };
+ Window* pWindows[] = { &pLine->m_aNameBox,
+ &pLine->m_aTypeBox,
+ &pLine->m_aValueEdit,
+ &pLine->m_aDateField,
+ &pLine->m_aTimeField,
+ &pLine->m_aDurationField,
+ &pLine->m_aEditButton,
+ &pLine->m_aYesNoButton,
+ &pLine->m_aRemoveButton, NULL };
Window** pCurrent = pWindows;
while ( *pCurrent )
{
@@ -2042,6 +2048,9 @@ void CustomPropertiesWindow::InitControl
m_nLineHeight =
( m_aRemoveButton.GetPosPixel().Y() * 2 ) + m_aRemoveButton.GetSizePixel().Height();
+
+ m_nDatePosX = m_aDateField.GetPosPixel().X();
+ m_nTimePosX = m_aTimeField.GetPosPixel().X();
}
sal_uInt16 CustomPropertiesWindow::GetVisibleLineCount() const
@@ -2096,10 +2105,6 @@ void CustomPropertiesWindow::AddLine( co
pCurrent++;
pNewCurrent++;
}
- //
- pNewLine->m_aDatePos = pNewLine->m_aDateField.GetPosPixel();
- pNewLine->m_aTimePos = pNewLine->m_aTimeField.GetPosPixel();
- pNewLine->m_aDateTimeSize = pNewLine->m_aDateField.GetSizePixel();
double nTmpValue = 0;
bool bTmpValue = false;
@@ -2208,8 +2213,15 @@ void CustomPropertiesWindow::DoScroll( s
if ( pLine->m_bIsRemoved )
continue;
- Window* pWindows[] = { &pLine->m_aNameBox, &pLine->m_aTypeBox, &pLine->m_aValueEdit, &pLine->m_aDurationField,
- &pLine->m_aYesNoButton, &pLine->m_aRemoveButton, NULL };
+ Window* pWindows[] = { &pLine->m_aNameBox,
+ &pLine->m_aTypeBox,
+ &pLine->m_aValueEdit,
+ &pLine->m_aDurationField,
+ &pLine->m_aEditButton,
+ &pLine->m_aDateField,
+ &pLine->m_aTimeField,
+ &pLine->m_aYesNoButton,
+ &pLine->m_aRemoveButton, NULL };
Window** pCurrent = pWindows;
while ( *pCurrent )
{