Tsutomu Uchino license statement
Hello, All of my past & future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. I have some patches on Openoffice bugtracker as user hanya, could be used under the same statement if someone want to migrate them to the libreoffice. Regards Tsutomu Uchino ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - editeng/source svtools/source sw/inc sw/source vcl/source vcl/unx
editeng/source/editeng/impedit2.cxx |7 ++-
svtools/source/edit/textview.cxx|4
sw/inc/crsrsh.hxx |5 +
sw/source/core/crsr/crsrsh.cxx |8
sw/source/ui/docvw/edtwin.cxx | 36 ++--
vcl/source/control/edit.cxx |7 +--
vcl/unx/gtk/window/gtkframe.cxx |4 +++-
7 files changed, 65 insertions(+), 6 deletions(-)
New commits:
commit e387056aa78f50e7be024014e9236aacd1fe7eab
Author: Tsutomu Uchino
Date: Tue Jan 16 16:17:17 2018 +
#i127662# send better window position to input method for suggestion window
diff --git a/editeng/source/editeng/impedit2.cxx
b/editeng/source/editeng/impedit2.cxx
index 2adf55cf57fa..e10fa9c67dc9 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -622,7 +622,12 @@ void ImpEditEngine::Command( const CommandEvent& rCEvt,
EditView* pView )
nInputEnd = pLine->GetEnd();
Rectangle aR2 = PaMtoEditCursor( EditPaM( aPaM.GetNode(),
nInputEnd ), GETCRSR_ENDOFLINE );
Rectangle aRect = pView->GetImpEditView()->GetWindowPos( aR1 );
-pView->GetWindow()->SetCursorRect( &aRect, aR2.Left()-aR1.Right()
);
+long nWidth = aR2.Left()-aR1.Right();
+if ( nWidth == 0 ) {
+Rectangle aR3 = PaMtoEditCursor( mpIMEInfos->aPos );
+nWidth = -(aR1.Left() - aR3.Left());
+}
+pView->GetWindow()->SetCursorRect( &aRect, nWidth );
}
else
{
diff --git a/svtools/source/edit/textview.cxx b/svtools/source/edit/textview.cxx
index 455866301843..c1adec5300a1 100644
--- a/svtools/source/edit/textview.cxx
+++ b/svtools/source/edit/textview.cxx
@@ -1048,6 +1048,10 @@ void TextView::Command( const CommandEvent& rCEvt )
long nWidth = aR2.Left()-aR1.Right();
aR1.Move( -GetStartDocPos().X(), -GetStartDocPos().Y() );
+if ( nWidth == 0 ) {
+Rectangle aR3 = mpImpl->mpTextEngine->PaMtoEditCursor(
mpImpl->mpTextEngine->mpIMEInfos->aPos );
+nWidth = -(aR1.Left() - aR3.Left());
+}
GetWindow()->SetCursorRect( &aR1, nWidth );
}
else
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index ac4227ebed20..ba3ef5aa0ddf 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -550,6 +550,11 @@ public:
* liefert das SRectangle, auf dem der Cursor steht.
*/
const SwRect &GetCharRect() const { return aCharRect; }
+
+// Obtains character rectangle at the position.
+sal_Bool GetCharRectAt( SwRect& rOrig, const SwPosition& rPos,
+ SwCrsrMoveState *pCMS = 0 ) const;
+
/*
* liefert zurueck, ob der Cursor sich ganz oder teilweise im
* sichtbaren Bereich befindet.
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 9ef7c499e86d..05c5ab7a8e58 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -1233,6 +1233,14 @@ sal_Bool SwCrsrShell::GoPrevCrsr()
}
+sal_Bool SwCrsrShell::GetCharRectAt( SwRect& rOrig, const SwPosition& rPos,
+ SwCrsrMoveState* pCMS ) const
+{
+SwCntntFrm * pFrm = GetCurrFrm();
+return pFrm ? pFrm->GetCharRect( rOrig, rPos, pCMS ) : sal_False;
+}
+
+
void SwCrsrShell::Paint( const Rectangle &rRect)
{
SET_CURR_SHELL( this );
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 6836fb982392..53f435e6909c 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -5059,8 +5059,40 @@ void SwEditWin::Command( const CommandEvent& rCEvt )
}
break;
case COMMAND_CURSORPOS:
-// will be handled by the base class
-break;
+{
+sal_Bool bIsDocReadOnly = rView.GetDocShell()->IsReadOnly() &&
+ rSh.IsCrsrReadonly();
+if ( !bIsDocReadOnly )
+{
+if( rSh.HasDrawView() && rSh.GetDrawView()->IsTextEdit() )
+{
+bCallBase = sal_False;
+rSh.GetDrawView()->GetTextEditOutlinerView()->Command( rCEvt );
+}
+else
+{
+const SwExtTextInput* pExtInp =
rSh.GetDoc()->GetExtTextInput();
+if ( pExtInp )
+{
+// The carret placed at the end of the preedit.
+if ( POS_COLLIDE_START == ComparePosition(
*pExtInp->End(), *pExtInp->End(),
+*rSh.GetCrsr()->End(),
*rSh.GetCrsr()->End() ) )
+{
+SwRect aInputRect;
+if ( rSh.GetCharRectAt( aInputRect, *pExtInp->Start()
) )
+
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - lingucomponent/source
lingucomponent/source/spellcheck/spell/sspellimp.cxx | 19 ++-
1 file changed, 14 insertions(+), 5 deletions(-)
New commits:
commit 76c1ee2548c52f393151abec9c2690656527558d
Author: Tsutomu Uchino
Date: Fri Sep 23 12:26:31 2016 +
#i127071# Fix illegal index on locations of spell cheker dictionary
diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
index 921986c..1958b03 100644
--- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
@@ -179,14 +179,23 @@ Sequence< Locale > SAL_CALL SpellChecker::getLocales()
std::list< SvtLinguConfigDictionaryEntry >::const_iterator aDictIt;
for (aDictIt = aDics.begin(); aDictIt != aDics.end(); ++aDictIt)
{
-uno::Sequence< rtl::OUString > aLocaleNames(
aDictIt->aLocaleNames );
uno::Sequence< rtl::OUString > aLocations( aDictIt->aLocations
);
-sal_Int32 nLen2 = aLocaleNames.getLength();
-for (k = 0; k < nLen2; ++k)
+if ( xAccess.is() && aLocations.getLength() )
{
-if (xAccess.is() && xAccess->exists(aLocations[k]))
+sal_Bool bAllFileExists = sal_False;
+sal_Int32 nLength = aLocations.getLength();
+for (sal_Int32 i = 0; i < nLength; ++i)
{
-aLocaleNamesSet.insert( aLocaleNames[k] );
+bAllFileExists |= xAccess->exists( aLocations[i] );
+}
+if ( bAllFileExists )
+{
+uno::Sequence< rtl::OUString > aLocaleNames(
aDictIt->aLocaleNames );
+sal_Int32 nLen2 = aLocaleNames.getLength();
+for (k = 0; k < nLen2; ++k)
+{
+aLocaleNamesSet.insert( aLocaleNames[k] );
+}
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - svtools/inc
svtools/inc/svtools/treelist.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 9265749be4b0ba24f04c39d78354109e5fcedcfc
Author: Tsutomu Uchino
Date: Mon Sep 19 13:29:14 2016 +
#i125762# fix null pointer reference while accessibility related call
diff --git a/svtools/inc/svtools/treelist.hxx b/svtools/inc/svtools/treelist.hxx
index 3aaf412..81d7959 100644
--- a/svtools/inc/svtools/treelist.hxx
+++ b/svtools/inc/svtools/treelist.hxx
@@ -404,7 +404,7 @@ inline sal_Bool SvListView::IsExpanded( SvListEntry* pEntry
) const
DBG_ASSERT(pEntry,"IsExpanded:No Entry");
SvViewData* pData = (SvViewData*)aDataTable.Get( (sal_uLong)pEntry );
DBG_ASSERT(pData,"Entry not in Table");
-return pData->IsExpanded();
+return pData && pData->IsExpanded();
}
inline sal_Bool SvListView::IsSelected( SvListEntry* pEntry ) const
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/generic
vcl/generic/glyphs/gcach_ftyp.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 4b57845388624251b121a3198ea9117a2b81ba14 Author: Tsutomu Uchino Date: Fri Dec 25 13:29:02 2015 + Resolves: #i126753# fix invalid parse of GSUB table for OpenType fonts (cherry picked from commit 9396ecb77711fb7da043f9865f9803a12d830daa) Change-Id: Ib34aa2310d83afec83b4a85f1661b763415159ed diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx index 5df5e2f..36b967f 100644 --- a/vcl/generic/glyphs/gcach_ftyp.cxx +++ b/vcl/generic/glyphs/gcach_ftyp.cxx @@ -1403,6 +1403,7 @@ bool ServerFont::ApplyGSUB( const FontSelectPattern& rFSD ) } const FT_Byte* pFeatureTable = pGsubBase + nOfsFeatureTable + nOffset; +pFeatureTable += 2; // ignore FeatureParams const sal_uInt16 nCntLookups = GetUShort( pFeatureTable+0 ); pFeatureTable += 2; for( sal_uInt16 i = 0; i < nCntLookups; ++i ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - vcl/source
vcl/source/glyphs/gcach_ftyp.cxx |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit 9396ecb77711fb7da043f9865f9803a12d830daa Author: Tsutomu Uchino Date: Fri Dec 25 13:29:02 2015 + #i126753# fix invalid parse of GSUB table for OpenType fonts diff --git a/vcl/source/glyphs/gcach_ftyp.cxx b/vcl/source/glyphs/gcach_ftyp.cxx index 8219bc9..59447ba 100644 --- a/vcl/source/glyphs/gcach_ftyp.cxx +++ b/vcl/source/glyphs/gcach_ftyp.cxx @@ -721,8 +721,8 @@ FreetypeServerFont::FreetypeServerFont( const ImplFontSelectData& rFSD, FtFontIn maFaceFT = pFI->GetFaceFT(); #ifdef HDU_DEBUG -fprintf( stderr, "FTSF::FTSF(\"%s\", h=%d, w=%d, sy=%d) => %d\n", -pFI->GetFontFileName()->getStr(), rFSD.mnHeight, rFSD.mnWidth, pFI->IsSymbolFont(), maFaceFT!=0 ); +fprintf( stderr, "FTSF::FTSF(\"%s\", h=%d, w=%d, vt=%d, sy=%d) => %d\n", +pFI->GetFontFileName()->getStr(), rFSD.mnHeight, rFSD.mnWidth, rFSD.mbVertical, pFI->IsSymbolFont(), maFaceFT!=0 ); #endif if( !maFaceFT ) @@ -2469,6 +2469,7 @@ bool FreetypeServerFont::ApplyGSUB( const ImplFontSelectData& rFSD ) } const FT_Byte* pFeatureTable = pGsubBase + nOfsFeatureTable + nOffset; +pFeatureTable += 2; // ignore FeatureParams const sal_uInt16 nCntLookups = GetUShort( pFeatureTable+0 ); pFeatureTable += 2; for( sal_uInt16 i = 0; i < nCntLookups; ++i ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: offapi/com
offapi/com/sun/star/awt/UnoControlButtonModel.idl | 10 ++ offapi/com/sun/star/awt/XButton.idl |3 +++ 2 files changed, 13 insertions(+) New commits: commit 054d3251d770a6104c524fa7483011877ed657b1 Author: Tsutomu Uchino Date: Wed Nov 18 12:44:57 2015 + Related: #i72580# Add descriptions about State property and button command (cherry picked from commit 78dce87d4bd6936f0310d96381a0130f3ba82ed0) Change-Id: Ide972a5574c0062a7ee4e4300e512715c55e8d37 diff --git a/offapi/com/sun/star/awt/UnoControlButtonModel.idl b/offapi/com/sun/star/awt/UnoControlButtonModel.idl index 3a5f01c..c28e31c 100644 --- a/offapi/com/sun/star/awt/UnoControlButtonModel.idl +++ b/offapi/com/sun/star/awt/UnoControlButtonModel.idl @@ -188,6 +188,16 @@ published service UnoControlButtonModel /** specifies the state of the control. + +If #Toggle property is set to `TRUE`, the pressed state +is enabled and its pressed state can be obtained with this property. + + +0: not pressed +1: pressed +2: don't know + +@see #Toggle */ [property] short State; diff --git a/offapi/com/sun/star/awt/XButton.idl b/offapi/com/sun/star/awt/XButton.idl index 24dfa73..3840d40 100644 --- a/offapi/com/sun/star/awt/XButton.idl +++ b/offapi/com/sun/star/awt/XButton.idl @@ -49,6 +49,9 @@ published interface XButton: com::sun::star::uno::XInterface /** sets a command string for pushing the button. + +@param Command +value can be used to detect which button is pressed. */ void setActionCommand( [in] string Command ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - offapi/com
offapi/com/sun/star/awt/UnoControlButtonModel.idl | 10 ++ offapi/com/sun/star/awt/XButton.idl |3 +++ 2 files changed, 13 insertions(+) New commits: commit 78dce87d4bd6936f0310d96381a0130f3ba82ed0 Author: Tsutomu Uchino Date: Wed Nov 18 12:44:57 2015 + #i72580# Add descriptions about State property and button command diff --git a/offapi/com/sun/star/awt/UnoControlButtonModel.idl b/offapi/com/sun/star/awt/UnoControlButtonModel.idl index a5d4124..d66e46d 100644 --- a/offapi/com/sun/star/awt/UnoControlButtonModel.idl +++ b/offapi/com/sun/star/awt/UnoControlButtonModel.idl @@ -225,6 +225,16 @@ published service UnoControlButtonModel //- /** specifies the state of the control. + +If Toggle property is set to , the pressed state +is enabled and its pressed state can be obtained with this property. + + +0: not pressed +1: pressed +2: don't know + +@see Toggle */ [property] short State; diff --git a/offapi/com/sun/star/awt/XButton.idl b/offapi/com/sun/star/awt/XButton.idl index fdd5b71..fe3f703 100644 --- a/offapi/com/sun/star/awt/XButton.idl +++ b/offapi/com/sun/star/awt/XButton.idl @@ -63,6 +63,9 @@ published interface XButton: com::sun::star::uno::XInterface //- /** sets a command string for pushing the button. + +@param Command +value can be used to detect which button is pressed. */ [oneway] void setActionCommand( [in] string Command ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - offapi/com
offapi/com/sun/star/accessibility/XAccessibleText.idl |2 +- offapi/com/sun/star/auth/XSSOManager.idl|2 +- offapi/com/sun/star/awt/XSimpleTabController.idl|4 ++-- offapi/com/sun/star/awt/grid/XGridDataModel.idl |4 ++-- offapi/com/sun/star/awt/grid/XGridRowSelection.idl |2 +- offapi/com/sun/star/awt/tree/XTreeControl.idl |2 +- offapi/com/sun/star/configuration/AccessRootElement.idl |4 ++-- offapi/com/sun/star/configuration/SetElement.idl|2 +- offapi/com/sun/star/configuration/UpdateRootElement.idl |4 ++-- offapi/com/sun/star/deployment/XPackage.idl |2 +- offapi/com/sun/star/deployment/XPackageRegistry.idl |2 +- offapi/com/sun/star/drawing/framework/XPane2.idl|2 +- offapi/com/sun/star/embed/XCommonEmbedPersist.idl |2 +- offapi/com/sun/star/embed/XEmbedObjectCreator.idl |6 +++--- offapi/com/sun/star/embed/XEmbedObjectFactory.idl |2 +- offapi/com/sun/star/embed/XEmbedPersist.idl |6 +++--- offapi/com/sun/star/embed/XInsertObjectDialog.idl |2 +- offapi/com/sun/star/frame/XStorable2.idl|2 +- offapi/com/sun/star/sdbcx/XColumnsSupplier.idl |2 +- offapi/com/sun/star/sync/SyncScheme.idl |2 +- offapi/com/sun/star/table/TableSortField.idl|4 ++-- offapi/com/sun/star/ucb/XDynamicResultSet.idl |2 +- offapi/com/sun/star/ucb/XInteractionSupplyName.idl |2 +- offapi/com/sun/star/ui/UIElementFactoryManager.idl |2 +- offapi/com/sun/star/util/XModifiable2.idl |4 ++-- 25 files changed, 35 insertions(+), 35 deletions(-) New commits: commit 902cd9fe198a4e24843b0e4432cbc2dd3c587056 Author: Tsutomu Uchino Date: Fri Nov 13 12:53:52 2015 + #i126649# Fix wrong at tag names diff --git a/offapi/com/sun/star/accessibility/XAccessibleText.idl b/offapi/com/sun/star/accessibility/XAccessibleText.idl index 29c9b97..31de362bf 100644 --- a/offapi/com/sun/star/accessibility/XAccessibleText.idl +++ b/offapi/com/sun/star/accessibility/XAccessibleText.idl @@ -312,7 +312,7 @@ published interface XAccessibleText : ::com::sun::star::uno::XInterface The first character of the new selection. The valid range is 0..length. -@parm nEndIndex +@param nEndIndex The position after the last character of the new selection. The valid range is 0..length. diff --git a/offapi/com/sun/star/auth/XSSOManager.idl b/offapi/com/sun/star/auth/XSSOManager.idl index f9bec9c..963b42b 100644 --- a/offapi/com/sun/star/auth/XSSOManager.idl +++ b/offapi/com/sun/star/auth/XSSOManager.idl @@ -72,7 +72,7 @@ published interface XSSOManager : ::com::sun::star::uno::XInterface the name of the target/acceptor side principal to which the source principal intends to authenticate. -@paran TargetHost +@param TargetHost the host name associated with the target principal. @returns diff --git a/offapi/com/sun/star/awt/XSimpleTabController.idl b/offapi/com/sun/star/awt/XSimpleTabController.idl index 5f30aa0..87c5a0f 100644 --- a/offapi/com/sun/star/awt/XSimpleTabController.idl +++ b/offapi/com/sun/star/awt/XSimpleTabController.idl @@ -55,7 +55,7 @@ published interface XSimpleTabController : com::sun::star::uno::XInterface which can be used further to address this tab by using other methods of this interface. -@return [long +@return an unique ID for this new tab. */ long insertTab(); @@ -139,7 +139,7 @@ published interface XSimpleTabController : com::sun::star::uno::XInterface //- /** return the unique ID of the current active tab. -@eturn [long] +@return ID the ID of the active tab. */ long getActiveTabID(); diff --git a/offapi/com/sun/star/awt/grid/XGridDataModel.idl b/offapi/com/sun/star/awt/grid/XGridDataModel.idl index 96ee4f0..55132a2 100644 --- a/offapi/com/sun/star/awt/grid/XGridDataModel.idl +++ b/offapi/com/sun/star/awt/grid/XGridDataModel.idl @@ -98,9 +98,9 @@ published interface XGridDataModel This method is provided for performance and convenience reasons, it delivers the same result as subsequent calls to getCellData would. -@param Row +@param RowIndex the index of the row whose data should is to be retrieved. -@raises ::com::sun::star::lang::IndexOutOfBoundsException +@throws ::com::sun::star::lang::IndexOutOfBoundsException of the given row index does not denote a valid row. */ sequence< any > diff --git a/offapi/com/sun/star/awt/grid/XGridRowSelection.idl b/offapi/com/sun/star/awt/grid/XGridRowSelection.idl index 15350de..8
[Libreoffice-commits] core.git: offapi/com udkapi/com
offapi/com/sun/star/drawing/DrawPage.idl|6 +++---
offapi/com/sun/star/geometry/IntegerBezierSegment2D.idl |2 +-
offapi/com/sun/star/geometry/RealBezierSegment2D.idl|2 +-
offapi/com/sun/star/report/XReportControlFormat.idl |2 +-
offapi/com/sun/star/report/XReportDefinition.idl|2 +-
offapi/com/sun/star/report/XReportEngine.idl|2 +-
offapi/com/sun/star/sdb/ErrorMessageDialog.idl |2 +-
offapi/com/sun/star/sdbc/XRowSetListener.idl|2 +-
offapi/com/sun/star/style/ParagraphProperties.idl |4 ++--
offapi/com/sun/star/style/ParagraphStyle.idl|2 +-
offapi/com/sun/star/text/Footnote.idl |2 +-
offapi/com/sun/star/text/TextPortion.idl|4 ++--
offapi/com/sun/star/text/TextTable.idl | 10 +-
offapi/com/sun/star/text/XNumberingRulesSupplier.idl|2 +-
offapi/com/sun/star/text/XTextTableCursor.idl |6 +++---
udkapi/com/sun/star/bridge/IiopBridge.idl |2 +-
udkapi/com/sun/star/bridge/UrpBridge.idl|2 +-
udkapi/com/sun/star/bridge/XBridge.idl |2 +-
18 files changed, 28 insertions(+), 28 deletions(-)
New commits:
commit 6917797cc8bcef55c4d9a96cf4c4f47e7edb59a8
Author: Tsutomu Uchino
Date: Wed Nov 4 05:49:19 2015 +
Resolves: #i126627# wrong type description in @see tag
(cherry picked from commit a17388ff7dfeda73445967f7680cd7dc2832c95e)
Change-Id: I8056767f88f4a6ced01a34f116e94f8e7192eefa
diff --git a/offapi/com/sun/star/drawing/DrawPage.idl
b/offapi/com/sun/star/drawing/DrawPage.idl
index 50d3b15..d8e6689 100644
--- a/offapi/com/sun/star/drawing/DrawPage.idl
+++ b/offapi/com/sun/star/drawing/DrawPage.idl
@@ -50,9 +50,9 @@ published service DrawPage
Every draw page may contain a form layer - that is, a hierarchy of
form elements. The layer can be
accessed using this interface.
-@see com.sun.star.form.FormComponent
-@see com.sun.star.form.FormComponents
-@see com.sun.star.form.Forms
+@see com::sun::star::form::FormComponent
+@see com::sun::star::form::FormComponents
+@see com::sun::star::form::Forms
*/
[optional] interface com::sun::star::form::XFormsSupplier;
};
diff --git a/offapi/com/sun/star/geometry/IntegerBezierSegment2D.idl
b/offapi/com/sun/star/geometry/IntegerBezierSegment2D.idl
index f444c13..ae05410 100644
--- a/offapi/com/sun/star/geometry/IntegerBezierSegment2D.idl
+++ b/offapi/com/sun/star/geometry/IntegerBezierSegment2D.idl
@@ -32,7 +32,7 @@ module com { module sun { module star { module geometry {
the end point of the last curve, and the remaining members
ignored.
-@see com.sun.star.rendering.XBezierPolyPolygon2D
+@see com::sun::star::rendering::XBezierPolyPolygon2D
@since OOo 2.0
*/
struct IntegerBezierSegment2D
diff --git a/offapi/com/sun/star/geometry/RealBezierSegment2D.idl
b/offapi/com/sun/star/geometry/RealBezierSegment2D.idl
index f7dfc8c..6899d7e 100644
--- a/offapi/com/sun/star/geometry/RealBezierSegment2D.idl
+++ b/offapi/com/sun/star/geometry/RealBezierSegment2D.idl
@@ -32,7 +32,7 @@ module com { module sun { module star { module geometry {
the end point of the last curve, and the remaining members
ignored.
-@see com.sun.star.rendering.XBezierPolyPolygon2D
+@see com::sun::star::rendering::XBezierPolyPolygon2D
@since OOo 2.0
*/
struct RealBezierSegment2D
diff --git a/offapi/com/sun/star/report/XReportControlFormat.idl
b/offapi/com/sun/star/report/XReportControlFormat.idl
index 836253d..42926ff 100644
--- a/offapi/com/sun/star/report/XReportControlFormat.idl
+++ b/offapi/com/sun/star/report/XReportControlFormat.idl
@@ -332,7 +332,7 @@ interface XReportControlFormat
};
/** determines the type of the strike out of the character.
-@see com.sun.star.awt.FontStrikeout
+@see com::sun::star::awt::FontStrikeout
*/
[attribute,bound] short CharStrikeout
{
diff --git a/offapi/com/sun/star/report/XReportDefinition.idl
b/offapi/com/sun/star/report/XReportDefinition.idl
index fc78ad9..cf412e9 100644
--- a/offapi/com/sun/star/report/XReportDefinition.idl
+++ b/offapi/com/sun/star/report/XReportDefinition.idl
@@ -145,7 +145,7 @@ interface XReportDefinition
[attribute,bound] string Caption;
/** Specifies whether groups in a multi column report are kept together.
-@see com.sun.star.report.GroupKeepTogether
+@see com::sun::star::report::GroupKeepTogether
*/
[attribute,bound] short GroupKeepTogether
{
diff --git a/offapi/com/sun/star/report/XReportEngine.idl
b/offapi/com/sun/star/report/XReportEngine.idl
index 99036b1..de92bd8 100644
--- a/offapi/com/sun/star/report/XReportEngine.idl
+++ b/offapi/com/sun/star/report/XReportEngine.idl
@@ -42,7 +42,7 @@ module com { module sun
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - offapi/com udkapi/com
offapi/com/sun/star/drawing/DrawPage.idl|6 +++---
offapi/com/sun/star/geometry/IntegerBezierSegment2D.idl |2 +-
offapi/com/sun/star/geometry/RealBezierSegment2D.idl|2 +-
offapi/com/sun/star/report/XReportControlFormat.idl |2 +-
offapi/com/sun/star/report/XReportDefinition.idl|2 +-
offapi/com/sun/star/report/XReportEngine.idl|2 +-
offapi/com/sun/star/sdb/ErrorMessageDialog.idl |2 +-
offapi/com/sun/star/sdbc/XRowSetListener.idl|2 +-
offapi/com/sun/star/style/ParagraphProperties.idl |4 ++--
offapi/com/sun/star/style/ParagraphStyle.idl|2 +-
offapi/com/sun/star/text/DocumentIndexFormat.idl|2 +-
offapi/com/sun/star/text/Footnote.idl |2 +-
offapi/com/sun/star/text/TextPortion.idl|4 ++--
offapi/com/sun/star/text/TextTable.idl | 10 +-
offapi/com/sun/star/text/XNumberingRulesSupplier.idl|2 +-
offapi/com/sun/star/text/XTextTableCursor.idl |6 +++---
udkapi/com/sun/star/bridge/IiopBridge.idl |2 +-
udkapi/com/sun/star/bridge/UrpBridge.idl|2 +-
udkapi/com/sun/star/bridge/XBridge.idl |2 +-
19 files changed, 29 insertions(+), 29 deletions(-)
New commits:
commit a17388ff7dfeda73445967f7680cd7dc2832c95e
Author: Tsutomu Uchino
Date: Wed Nov 4 05:49:19 2015 +
#i126627# wrong type description in @see tag
diff --git a/offapi/com/sun/star/drawing/DrawPage.idl
b/offapi/com/sun/star/drawing/DrawPage.idl
index 0958e7a..5052033 100644
--- a/offapi/com/sun/star/drawing/DrawPage.idl
+++ b/offapi/com/sun/star/drawing/DrawPage.idl
@@ -69,9 +69,9 @@ published service DrawPage
Every draw page may contain a form layer - that is, a hierarchy of
form elements. The layer can be
accessed using this interface.
-@see com.sun.star.form.FormComponent
-@see com.sun.star.form.FormComponents
-@see com.sun.star.form.Forms
+@see com::sun::star::form::FormComponent
+@see com::sun::star::form::FormComponents
+@see com::sun::star::form::Forms
*/
[optional] interface com::sun::star::form::XFormsSupplier;
};
diff --git a/offapi/com/sun/star/geometry/IntegerBezierSegment2D.idl
b/offapi/com/sun/star/geometry/IntegerBezierSegment2D.idl
index 7507517..7c47f77 100644
--- a/offapi/com/sun/star/geometry/IntegerBezierSegment2D.idl
+++ b/offapi/com/sun/star/geometry/IntegerBezierSegment2D.idl
@@ -36,7 +36,7 @@ module com { module sun { module star { module geometry {
the end point of the last curve, and the remaining members
ignored.
-@see com.sun.star.rendering.XBezierPolyPolygon2D
+@see com::sun::star::rendering::XBezierPolyPolygon2D
@since OpenOffice 2.0
*/
struct IntegerBezierSegment2D
diff --git a/offapi/com/sun/star/geometry/RealBezierSegment2D.idl
b/offapi/com/sun/star/geometry/RealBezierSegment2D.idl
index 3881ff8..656602e 100644
--- a/offapi/com/sun/star/geometry/RealBezierSegment2D.idl
+++ b/offapi/com/sun/star/geometry/RealBezierSegment2D.idl
@@ -36,7 +36,7 @@ module com { module sun { module star { module geometry {
the end point of the last curve, and the remaining members
ignored.
-@see com.sun.star.rendering.XBezierPolyPolygon2D
+@see com::sun::star::rendering::XBezierPolyPolygon2D
@since OpenOffice 2.0
*/
published struct RealBezierSegment2D
diff --git a/offapi/com/sun/star/report/XReportControlFormat.idl
b/offapi/com/sun/star/report/XReportControlFormat.idl
index 393da19..af42ca9 100644
--- a/offapi/com/sun/star/report/XReportControlFormat.idl
+++ b/offapi/com/sun/star/report/XReportControlFormat.idl
@@ -352,7 +352,7 @@ published interface XReportControlFormat
//-
/** determins the type of the strike out of the character.
-@see com.sun.star.awt.FontStrikeout
+@see com::sun::star::awt::FontStrikeout
*/
[attribute,bound] short CharStrikeout
{
diff --git a/offapi/com/sun/star/report/XReportDefinition.idl
b/offapi/com/sun/star/report/XReportDefinition.idl
index 5451943..b1e4685 100644
--- a/offapi/com/sun/star/report/XReportDefinition.idl
+++ b/offapi/com/sun/star/report/XReportDefinition.idl
@@ -191,7 +191,7 @@ published interface XReportDefinition
[attribute,bound] string Caption;
/** Specifies whether groups in a multi column report are kept together.
-@see com.sun.star.report.GroupKeepTogether
+@see com::sun::star::report::GroupKeepTogether
*/
[attribute,bound] short GroupKeepTogether
{
diff --git a/offapi/com/sun/star/report/XReportEngine.idl
b/offapi/com/sun/star/report/XReportEngine.idl
index 3ac0db3..4d6029f 100644
--- a/offapi/com/sun/star/report/XReportEngine.idl
+++ b/offapi/com/sun/star/report/XReportEngine.idl
@@ -69,7 +69,7
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - i18npool/source
i18npool/source/search/textsearch.cxx | 24
1 file changed, 20 insertions(+), 4 deletions(-)
New commits:
commit cfb82869af772bec5b67f8eff3c9e8402b90c84a
Author: Tsutomu Uchino
Date: Sat Oct 10 08:42:22 2015 +
#i107619# use next index to the last position from the offset when the
match result is started at the end of thes string
diff --git a/i18npool/source/search/textsearch.cxx
b/i18npool/source/search/textsearch.cxx
index 5c8dac6..7c716e8 100644
--- a/i18npool/source/search/textsearch.cxx
+++ b/i18npool/source/search/textsearch.cxx
@@ -241,10 +241,18 @@ SearchResult TextSearch::searchForward( const OUString&
searchStr, sal_Int32 sta
sres = (this->*fnForward)( in_str, newStartPos, newEndPos );
+sal_Int32 nOffsetLength = offset.getLength();
+sal_Int32 nStartOffset = 0;
for ( int k = 0; k < sres.startOffset.getLength(); k++ )
{
-if (sres.startOffset[k])
- sres.startOffset[k] = offset[sres.startOffset[k]];
+nStartOffset = sres.startOffset[k];
+if ( nStartOffset )
+{
+if ( nStartOffset < nOffsetLength )
+sres.startOffset[k] = offset[nStartOffset];
+else
+sres.startOffset[k] = offset[offset.getLength()-1] +1;
+}
// JP 20.6.2001: end is ever exclusive and then don't return
// the position of the next character - return the
// next position behind the last found character!
@@ -330,6 +338,8 @@ SearchResult TextSearch::searchBackward( const OUString&
searchStr, sal_Int32 st
sres = (this->*fnBackward)( in_str, newStartPos, newEndPos );
+sal_Int32 nOffsetLength = offset.getLength();
+sal_Int32 nEndOffset = 0;
for ( int k = 0; k < sres.startOffset.getLength(); k++ )
{
if (sres.startOffset[k])
@@ -338,8 +348,14 @@ SearchResult TextSearch::searchBackward( const OUString&
searchStr, sal_Int32 st
// the position of the next character - return the
// next position behind the last found character!
// "a b c" find "b" must return 2,3 and not 2,4!!!
-if (sres.endOffset[k])
- sres.endOffset[k] = offset[sres.endOffset[k]];
+nEndOffset = sres.endOffset[k];
+if ( nEndOffset )
+{
+if ( nEndOffset < nOffsetLength )
+sres.endOffset[k] = offset[nEndOffset];
+else
+sres.endOffset[k] = offset[offset.getLength()-1] +1;
+}
}
}
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - svtools/inc svtools/source
svtools/inc/svtools/treelist.hxx |4 +--
svtools/source/contnr/svtreebx.cxx | 44 ++---
2 files changed, 24 insertions(+), 24 deletions(-)
New commits:
commit 2d382b750bec3f12df851da49c61268be0712c39
Author: Tsutomu Uchino
Date: Tue Mar 24 17:05:34 2015 +
#i125147# check the pointer while get accessible state set
diff --git a/svtools/inc/svtools/treelist.hxx b/svtools/inc/svtools/treelist.hxx
index 8ca9b9d..3aaf412 100644
--- a/svtools/inc/svtools/treelist.hxx
+++ b/svtools/inc/svtools/treelist.hxx
@@ -411,14 +411,14 @@ inline sal_Bool SvListView::IsSelected( SvListEntry*
pEntry ) const
DBG_ASSERT(pEntry,"IsExpanded:No Entry");
SvViewData* pData = (SvViewData*)aDataTable.Get( (sal_uLong)pEntry );
DBG_ASSERT(pData,"Entry not in Table");
-return pData->IsSelected();
+return pData && pData->IsSelected();
}
inline sal_Bool SvListView::HasEntryFocus( SvListEntry* pEntry ) const
{
DBG_ASSERT(pEntry,"IsExpanded:No Entry");
SvViewData* pData = (SvViewData*)aDataTable.Get( (sal_uLong)pEntry );
DBG_ASSERT(pData,"Entry not in Table");
-return pData->HasFocus();
+return pData && pData->HasFocus();
}
inline void SvListView::SetEntryFocus( SvListEntry* pEntry, sal_Bool bFocus )
const
{
diff --git a/svtools/source/contnr/svtreebx.cxx
b/svtools/source/contnr/svtreebx.cxx
index 72c8df3..99eb3ad 100644
--- a/svtools/source/contnr/svtreebx.cxx
+++ b/svtools/source/contnr/svtreebx.cxx
@@ -2757,29 +2757,29 @@ void SvTreeListBox::FillAccessibleEntryStateSet(
SvLBoxEntry* pEntry, ::utl::Acc
{
DBG_ASSERT( pEntry, "SvTreeListBox::FillAccessibleEntryStateSet: invalid
entry" );
-if ( pEntry->HasChildsOnDemand() || pEntry->HasChilds() )
-{
-rStateSet.AddState( AccessibleStateType::EXPANDABLE );
-if ( IsExpanded( pEntry ) )
-rStateSet.AddState( (sal_Int16)AccessibleStateType::EXPANDED );
-}
-
-if ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED )
-rStateSet.AddState( AccessibleStateType::CHECKED );
-if ( IsEntryVisible( pEntry ) )
-rStateSet.AddState( AccessibleStateType::VISIBLE );
-if ( IsSelected( pEntry ) )
-rStateSet.AddState( AccessibleStateType::SELECTED );
-if ( IsEnabled() )
-{
-rStateSet.AddState( AccessibleStateType::ENABLED );
-rStateSet.AddState( AccessibleStateType::FOCUSABLE );
-rStateSet.AddState( AccessibleStateType::SELECTABLE );
-SvViewDataEntry* pViewDataNewCur = 0;
-if( pEntry )
+if ( pEntry )
+{
+if ( pEntry->HasChildsOnDemand() || pEntry->HasChilds() )
+{
+rStateSet.AddState( AccessibleStateType::EXPANDABLE );
+if ( IsExpanded( pEntry ) )
+rStateSet.AddState( (sal_Int16)AccessibleStateType::EXPANDED );
+}
+
+if ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED )
+rStateSet.AddState( AccessibleStateType::CHECKED );
+if ( IsEntryVisible( pEntry ) )
+rStateSet.AddState( AccessibleStateType::VISIBLE );
+if ( IsSelected( pEntry ) )
+rStateSet.AddState( AccessibleStateType::SELECTED );
+if ( IsEnabled() )
{
-pViewDataNewCur= GetViewDataEntry(pEntry);
-if(pViewDataNewCur->HasFocus())
+rStateSet.AddState( AccessibleStateType::ENABLED );
+rStateSet.AddState( AccessibleStateType::FOCUSABLE );
+rStateSet.AddState( AccessibleStateType::SELECTABLE );
+SvViewDataEntry* pViewDataNewCur = 0;
+pViewDataNewCur = GetViewDataEntry(pEntry);
+if( pViewDataNewCur && pViewDataNewCur->HasFocus() )
rStateSet.AddState( AccessibleStateType::FOCUSED );
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - svx/inc svx/source
svx/inc/svx/dialogs.hrc| 52 +++--
svx/source/dialog/sdstring.src | 72 +
2 files changed, 106 insertions(+), 18 deletions(-)
New commits:
commit 875b13c2ac80640410dcd7c63a7ecb8f33eec9a0
Author: Tsutomu Uchino
Date: Fri Feb 20 15:32:21 2015 +
#i126116# nonlocalizable arrow names
diff --git a/svx/inc/svx/dialogs.hrc b/svx/inc/svx/dialogs.hrc
index 5051f8f..256b584 100644
--- a/svx/inc/svx/dialogs.hrc
+++ b/svx/inc/svx/dialogs.hrc
@@ -804,27 +804,43 @@
#define RID_SVXSTR_LEND9_DEF(RID_SVX_START + 779)
#define RID_SVXSTR_LEND10_DEF (RID_SVX_START + 780)
#define RID_SVXSTR_LEND11_DEF (RID_SVX_START + 781)
-#define RID_SVXSTR_LEND0(RID_SVX_START + 782)
-#define RID_SVXSTR_LEND1(RID_SVX_START + 783)
-#define RID_SVXSTR_LEND2(RID_SVX_START + 784)
-#define RID_SVXSTR_LEND3(RID_SVX_START + 785)
-#define RID_SVXSTR_LEND4(RID_SVX_START + 786)
-#define RID_SVXSTR_LEND5(RID_SVX_START + 787)
-#define RID_SVXSTR_LEND6(RID_SVX_START + 788)
-#define RID_SVXSTR_LEND7(RID_SVX_START + 789)
-#define RID_SVXSTR_LEND8(RID_SVX_START + 790)
-#define RID_SVXSTR_LEND9(RID_SVX_START + 791)
-#define RID_SVXSTR_LEND10 (RID_SVX_START + 792)
-#define RID_SVXSTR_LEND11 (RID_SVX_START + 793)
+#define RID_SVXSTR_LEND12_DEF (RID_SVX_START + 782)
+#define RID_SVXSTR_LEND13_DEF (RID_SVX_START + 783)
+#define RID_SVXSTR_LEND14_DEF (RID_SVX_START + 784)
+#define RID_SVXSTR_LEND15_DEF (RID_SVX_START + 785)
+#define RID_SVXSTR_LEND16_DEF (RID_SVX_START + 786)
+#define RID_SVXSTR_LEND17_DEF (RID_SVX_START + 787)
+#define RID_SVXSTR_LEND18_DEF (RID_SVX_START + 788)
+#define RID_SVXSTR_LEND19_DEF (RID_SVX_START + 789)
+#define RID_SVXSTR_LEND0(RID_SVX_START + 790)
+#define RID_SVXSTR_LEND1(RID_SVX_START + 791)
+#define RID_SVXSTR_LEND2(RID_SVX_START + 792)
+#define RID_SVXSTR_LEND3(RID_SVX_START + 793)
+#define RID_SVXSTR_LEND4(RID_SVX_START + 794)
+#define RID_SVXSTR_LEND5(RID_SVX_START + 795)
+#define RID_SVXSTR_LEND6(RID_SVX_START + 796)
+#define RID_SVXSTR_LEND7(RID_SVX_START + 797)
+#define RID_SVXSTR_LEND8(RID_SVX_START + 798)
+#define RID_SVXSTR_LEND9(RID_SVX_START + 799)
+#define RID_SVXSTR_LEND10 (RID_SVX_START + 800)
+#define RID_SVXSTR_LEND11 (RID_SVX_START + 801)
+#define RID_SVXSTR_LEND12 (RID_SVX_START + 802)
+#define RID_SVXSTR_LEND13 (RID_SVX_START + 803)
+#define RID_SVXSTR_LEND14 (RID_SVX_START + 804)
+#define RID_SVXSTR_LEND15 (RID_SVX_START + 805)
+#define RID_SVXSTR_LEND16 (RID_SVX_START + 806)
+#define RID_SVXSTR_LEND17 (RID_SVX_START + 807)
+#define RID_SVXSTR_LEND18 (RID_SVX_START + 808)
+#define RID_SVXSTR_LEND19 (RID_SVX_START + 809)
#define RID_SVXSTR_LEND_DEF_START RID_SVXSTR_LEND0_DEF
-#define RID_SVXSTR_LEND_DEF_END RID_SVXSTR_LEND11_DEF
+#define RID_SVXSTR_LEND_DEF_END RID_SVXSTR_LEND19_DEF
#define RID_SVXSTR_LEND_START RID_SVXSTR_LEND0
-#define RID_SVXSTR_LEND_END RID_SVXSTR_LEND11
+#define RID_SVXSTR_LEND_END RID_SVXSTR_LEND19
-#define RID_SVXSTR_QRY_PRINT_TITLE (RID_SVX_START + 802)
-#define RID_SVXSTR_QRY_PRINT_MSG(RID_SVX_START + 803)
-#define RID_SVXSTR_QRY_PRINT_ALL(RID_SVX_START + 804)
-#define RID_SVXSTR_QRY_PRINT_SELECTION (RID_SVX_START + 805)
+#define RID_SVXSTR_QRY_PRINT_TITLE (RID_SVX_START + 815)
+#define RID_SVXSTR_QRY_PRINT_MSG(RID_SVX_START + 816)
+#define RID_SVXSTR_QRY_PRINT_ALL(RID_SVX_START + 817)
+#define RID_SVXSTR_QRY_PRINT_SELECTION (RID_SVX_START + 818)
// strings for graphic attributes/undo
#define RID_SVXSTR_GRAFCROP (RID_SVX_START + 820)
diff --git a/svx/source/dialog/sdstring.src b/svx/source/dialog/sdstring.src
index a7c0d5c..2fbe2e9 100644
--- a/svx/source/dialog/sdstring.src
+++ b/svx/source/dialog/sdstring.src
@@ -1090,6 +1090,46 @@ String RID_SVXSTR_LEND11_DEF
{
Text = "Arrow";
};
+/* nicht uebersetzen */
+String RID_SVXSTR_LEND12_DEF
+{
+Text = "Short line Arrow";
+};
+/* nicht uebersetzen */
+String RID_SVXSTR_LEND13_DEF
+{
+Text = "Triangle unfilled";
+};
+/* nicht uebersetzen */
+String RID_SVXSTR_LEND
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - officecfg/registry
officecfg/registry/data/org/openoffice/Office/Labels.xcu |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 68df6f563e9e42bdf1fb7d72243dc76a12486d92 Author: Tsutomu Uchino Date: Tue Feb 3 14:02:03 2015 + #i89465# fix label width of Avery j8159 diff --git a/officecfg/registry/data/org/openoffice/Office/Labels.xcu b/officecfg/registry/data/org/openoffice/Office/Labels.xcu index 7d8732d..69d1bcf 100644 --- a/officecfg/registry/data/org/openoffice/Office/Labels.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Labels.xcu @@ -895,7 +895,7 @@ - S;6654;3386;6400;3386;646;1306;3;8;21000;29700 + S;6654;3386;6350;3386;646;1306;3;8;21000;29700 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - officecfg/registry
officecfg/registry/data/org/openoffice/Office/Labels.xcu | 2442 +++ 1 file changed, 1221 insertions(+), 1221 deletions(-) New commits: commit 1ee6707298ae64267462b210fc74fff0cd442e03 Author: Tsutomu Uchino Date: Mon Feb 2 15:17:50 2015 + #i18217# add width and height of page for part of existing label definitions diff --git a/officecfg/registry/data/org/openoffice/Office/Labels.xcu b/officecfg/registry/data/org/openoffice/Office/Labels.xcu index 343a831..7d8732d 100644 --- a/officecfg/registry/data/org/openoffice/Office/Labels.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Labels.xcu @@ -37,7 +37,7 @@ -S;14732;2000;14732;2000;3134;1843;1;13 + S;14732;2000;14732;2000;3134;1843;1;13;21000;29700 @@ -48,7 +48,7 @@ -S;8128;4657;7874;4657;2499;872;2;6 + S;8128;4657;7874;4657;2499;872;2;6;21000;29700 @@ -59,7 +59,7 @@ -S;21000;29700;21000;29700;0;0;1;1 + S;21000;29700;21000;29700;0;0;1;1;21000;29700 @@ -70,7 +70,7 @@ -S;24500;17000;24500;17000;2600;2000;1;1 + S;24500;17000;24500;17000;2600;2000;1;1;21000;29700 @@ -81,7 +81,7 @@ -S;21000;29700;21000;29700;0;0;1;1 + S;21000;29700;21000;29700;0;0;1;1;21000;29700 @@ -92,7 +92,7 @@ -S;6604;3810;6350;3810;720;1515;3;7 + S;6604;3810;6350;3810;720;1515;3;7;21000;29700 @@ -103,7 +103,7 @@ -S;10160;3810;9906;3810;467;1515;2;7 + S;10160;3810;9906;3810;467;1515;2;7;21000;29700 @@ -114,7 +114,7 @@ -S;10160;6773;9906;6773;467;1304;2;4 + S;10160;6773;9906;6773;467;1304;2;4;21000;29700 @@ -125,7 +125,7 @@ -S;7620;5927;7000;5200;3190;3360;2;4 + S;7620;5927;7000;5200;3190;3360;2;4;21000;29700 @@ -136,7 +136,7 @@ -S;8128;3810;7620;3175;2626;3738;2;6 + S;8128;3810;7620;3175;2626;3738;2;6;21000;29700 @@ -147,7 +147,7 @@ -S;4260;5080;3810;3810;2205;2785;4;5 + S;4260;5080;3810;3810;2205;2785;4;5;21000;29700 @@ -158,7 +158,7 @@ -S;7874;7872;7195;7195;2966;3381;2;3 + S;7874;7872;7195;7195;2966;3381;2;3;21000;29700 @@ -169,7 +169,7 @@ -S;21000;29700;21000;29700;0;0;1;1 + S;21000;29700;21000;29700;0;0;1;1;21000;29700 @@ -180,7 +180,7 @@ -S;9000;5080;7000;5080;2500;2143;2;5 + S;9000;5080;7000;5080;2500;2143;2;5;21000;29700 @@ -191,7 +191,7 @@ -S;10850;17000;10850;17000;16850;2000;1;1 + S;10850;17000;10850;17000;16850;2000;1;1;21000;29700 @@ -202,7 +202,7 @@ -S;14850;21000;14850;21000;14850;0;1;1 + S;14850;21000;14850;21000;14850;0;1;1;21000;29700 @@ -213,7 +213,7 @@ -S;7700;14850;7700;12050;11900;1400;1;2 + S;7700;14850;7700;12050;11900;1400;1;2;21000;29700 @@ -224,7 +224,7 @@ -S;10500;14850;10500;14850;10500;0;1;2 + S;10500;14850;10500;14850;10500;0;1;2;21000;29700 @@ -235,7 +235,7 @@ -S;14850;21000;14850;21000;0;0;2;1 + S;14850;21000;14850;21000;0;0;2;1;21000;29700
[Libreoffice-commits] core.git: 12 commits - basctl/source editeng/source filter/source framework/source include/editeng offapi/com sfx2/source svtools/source unusedcode.easy vcl/source vcl/unx xmloff
basctl/source/dlged/dlgedobj.cxx|2 -
basctl/source/inc/dlgedobj.hxx |2 -
editeng/source/accessibility/AccessibleEditableTextPara.cxx |3 +
filter/source/config/cache/filtercache.cxx |2 -
framework/source/accelerators/acceleratorconfiguration.cxx | 13
framework/source/inc/accelerators/acceleratorconfiguration.hxx | 12 +++
include/editeng/AccessibleEditableTextPara.hxx |2 -
offapi/com/sun/star/accessibility/XAccessibleTextAttributes.idl |3 +
offapi/com/sun/star/ui/XAcceleratorConfiguration.idl|6 ++-
sfx2/source/doc/objstor.cxx |3 -
svtools/source/contnr/treelist.cxx |4 +-
unusedcode.easy | 16
--
vcl/source/opengl/OpenGLHelper.cxx |2 -
vcl/unx/kde4/KDESalGraphics.cxx |2 -
xmloff/source/forms/elementimport.cxx |6 +++
xmloff/source/forms/elementimport.hxx |1
16 files changed, 49 insertions(+), 30 deletions(-)
New commits:
commit f2ae6d2053256e1917104f1c44485099966155be
Author: Tsutomu Uchino
Date: Sat Jan 31 07:26:19 2015 +
Resolves: #i114416# use default service name for scroll bar...
if failed to detect the control-implementation
(cherry picked from commit 23e16b91ad69a123e795d63f2d4862d94412d582)
Conflicts:
xmloff/source/forms/elementimport.cxx
xmloff/source/forms/elementimport.hxx
Change-Id: I0ab4f9ff909ceba18a74d38488f6d0bdb3126110
diff --git a/xmloff/source/forms/elementimport.cxx
b/xmloff/source/forms/elementimport.cxx
index 4f50177..608fcb5 100644
--- a/xmloff/source/forms/elementimport.cxx
+++ b/xmloff/source/forms/elementimport.cxx
@@ -683,6 +683,7 @@ namespace xmloff
case OControlElement::IMAGE_FRAME: pServiceName =
"com.sun.star.form.component.DatabaseImageControl"; break;
case OControlElement::HIDDEN:pServiceName =
"com.sun.star.form.component.HiddenControl"; break;
case OControlElement::GRID: pServiceName =
"com.sun.star.form.component.GridControl"; break;
+case OControlElement::VALUERANGE:pServiceName =
"com.sun.star.form.component.ScrollBar"; break;
case OControlElement::TIME: pServiceName =
"com.sun.star.form.component.TimeField"; break;
case OControlElement::DATE: pServiceName =
"com.sun.star.form.component.DateField"; break;
default: break;
@@ -2112,6 +2113,11 @@ namespace xmloff
}
}
+OUString OFormImport::determineDefaultServiceName() const
+{
+return OUString("com.sun.star.form.component.Form");
+}
+
} // namespace xmloff
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/elementimport.hxx
b/xmloff/source/forms/elementimport.hxx
index 4d2592a..230ff6d 100644
--- a/xmloff/source/forms/elementimport.hxx
+++ b/xmloff/source/forms/elementimport.hxx
@@ -695,6 +695,7 @@ namespace xmloff
sal_uInt16 _nPrefix, const OUString& _rLocalName,
OControlElement::ElementType _eType );
+virtual OUString determineDefaultServiceName() const SAL_OVERRIDE;
void implTranslateStringListProperty(const OUString& _rPropertyName,
const OUString& _rValue);
};
commit e112dc0df7344e98414f64e70ddb7f764790bd06
Author: Caolán McNamara
Date: Sun Feb 1 09:06:30 2015 +
callcatcher: yet more unused code
Change-Id: I75b8cdffd965c6d99fd3693a6297c023279df76e
diff --git a/unusedcode.easy b/unusedcode.easy
index 51eea3a..fed4585 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -2,8 +2,6 @@ BigInt::BigInt(unsigned int)
CalendarWrapper::getDSTOffsetInMillis() const
CalendarWrapper::getZoneOffsetInMillis() const
FontCharMap::GetDefaultMap(bool)
-Interceptor::addEventListener(com::sun::star::uno::Reference
const&)
-Interceptor::removeEventListener(com::sun::star::uno::Reference
const&)
LineListBox::Clear()
LineListBox::InsertEntry(rtl::OUString const&, int)
LineListBox::RemoveEntry(int)
@@ -62,10 +60,12 @@ ScUserListItem::GetValueText() const
ScVbaFormat::getAddIndent()
ScVbaFormat::setAddIndent(com::sun::star::uno::Any
const&)
ScViewObjectModeItem::GetValueText(unsigned short) const
+SdrUndoObjList::SetOrdNum(unsigned int)
SecurityEnvironment_NssImpl::getCertificate(rtl::OUString const&,
rtl::OUString const&)
SfxAppMenuControl_Impl::RegisterControl(unsigned short, SfxModule*)
SfxBoolItem::GetValueCount() const
SfxFrameItem::GetValueText() const
+SfxObjectShell::DdeExecute
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - officecfg/registry sw/source
officecfg/registry/schema/org/openoffice/Office/Labels.xcs |4
officecfg/registry/schema/org/openoffice/Office/Writer.xcs | 12
sw/source/ui/app/applab.cxx| 18 -
sw/source/ui/envelp/label1.cxx |4
sw/source/ui/envelp/labelcfg.cxx |6
sw/source/ui/envelp/labfmt.cxx | 16 +
sw/source/ui/envelp/labfmt.hrc |4
sw/source/ui/envelp/labfmt.hxx |4
sw/source/ui/envelp/labfmt.src | 72 +++-
sw/source/ui/envelp/labimg.cxx | 206 +++--
sw/source/ui/envelp/labimp.hxx |2
sw/source/ui/inc/labimg.hxx|2
12 files changed, 234 insertions(+), 116 deletions(-)
New commits:
commit 7fb6496ef1c553b2d186505b18672bb8b984ce9a
Author: Tsutomu Uchino
Date: Sat Jan 31 16:55:56 2015 +
#i53718# add support of paper size for label document
diff --git a/officecfg/registry/schema/org/openoffice/Office/Labels.xcs
b/officecfg/registry/schema/org/openoffice/Office/Labels.xcs
index 996bdcc..488640d 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Labels.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Labels.xcs
@@ -40,10 +40,10 @@
- Contains the measurement data of
the label concatenated by a colon (;) in the following order: 'C' or
'S';Horizontal Distance;Vertical Distance;Width;Height;Left margin;Upper
margin;Columns;Rows" while 'C' marks a continuous label and
'S' marks a sheet.
+ Contains the measurement data of
the label concatenated by a colon (;) in the following order: 'C' or
'S';Horizontal Distance;Vertical Distance;Width;Height;Left margin;Upper
margin;Columns;Rows;Paper Width;Paper Height" while 'C' marks a
continuous label and 'S' marks a sheet.
diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
index 1610f18..30f25ac3 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -5026,6 +5026,18 @@
0
+
+
+ Specifies the width of
the paper [UNIT=1/100 mm].
+
+ 1
+
+
+
+ Specifies the height of
the paper [UNIT=1/100 mm].
+
+ 1
+
diff --git a/sw/source/ui/app/applab.cxx b/sw/source/ui/app/applab.cxx
index 5eb0b96..425b469 100644
--- a/sw/source/ui/app/applab.cxx
+++ b/sw/source/ui/app/applab.cxx
@@ -97,7 +97,8 @@ const SwFrmFmt *lcl_InsertBCText( SwWrtShell& rSh, const
SwLabItem& rItem,
sal_uInt16 nCol, sal_uInt16 nRow, sal_Bool bPage)
{
SfxItemSet aSet(rSh.GetAttrPool(), RES_ANCHOR, RES_ANCHOR,
-RES_VERT_ORIENT, RES_VERT_ORIENT, RES_HORI_ORIENT,
RES_HORI_ORIENT, 0 );
+RES_VERT_ORIENT, RES_VERT_ORIENT, RES_HORI_ORIENT,
RES_HORI_ORIENT,
+RES_LR_SPACE, RES_LR_SPACE, 0 );
sal_uInt16 nPhyPageNum, nVirtPageNum;
rSh.GetPageNum( nPhyPageNum, nVirtPageNum );
@@ -109,6 +110,10 @@ const SwFrmFmt *lcl_InsertBCText( SwWrtShell& rSh, const
SwLabItem& rItem,
aSet.Put(SwFmtVertOrient(rItem.lUpper + nRow * rItem.lVDist,
text::VertOrientation::NONE, text::RelOrientation::PAGE_FRAME ));
}
+if ( nCol == rItem.nCols -1 )
+{
+aSet.Put( SvxLRSpaceItem( 0, 0, 0, 0, RES_LR_SPACE ) );
+}
const SwFrmFmt *pFmt = rSh.NewFlyFrm(aSet, sal_True, &rFmt ); // Fly
einfuegen
ASSERT( pFmt, "Fly not inserted" );
@@ -137,7 +142,8 @@ const SwFrmFmt *lcl_InsertLabText( SwWrtShell& rSh, const
SwLabItem& rItem,
sal_uInt16 nCol, sal_uInt16 nRow, sal_Bool bLast,
sal_Bool bPage)
{
SfxItemSet aSet(rSh.GetAttrPool(), RES_ANCHOR, RES_ANCHOR,
-
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - officecfg/registry xmloff/source
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |4
++--
xmloff/source/forms/elementimport.cxx|9
-
xmloff/source/forms/elementimport.hxx|2 +-
3 files changed, 11 insertions(+), 4 deletions(-)
New commits:
commit 23e16b91ad69a123e795d63f2d4862d94412d582
Author: Tsutomu Uchino
Date: Sat Jan 31 07:26:19 2015 +
#i114416# use default service name for scroll bar if failed to detect the
control-implementation
diff --git a/xmloff/source/forms/elementimport.cxx
b/xmloff/source/forms/elementimport.cxx
index 672d9a7..89ad745 100644
--- a/xmloff/source/forms/elementimport.cxx
+++ b/xmloff/source/forms/elementimport.cxx
@@ -190,7 +190,7 @@ namespace xmloff
}
if ( !m_sServiceName.getLength() )
-determineDefaultServiceName();
+m_sServiceName = determineDefaultServiceName();
// create the object *now*. This allows setting properties in the
various handleAttribute methods.
// (Though currently not all code is migrated to this pattern, most
attributes are still handled
@@ -712,6 +712,7 @@ namespace xmloff
case OControlElement::IMAGE_FRAME: pServiceName =
"com.sun.star.form.component.DatabaseImageControl"; break;
case OControlElement::HIDDEN:pServiceName =
"com.sun.star.form.component.HiddenControl"; break;
case OControlElement::GRID: pServiceName =
"com.sun.star.form.component.GridControl"; break;
+case OControlElement::VALUERANGE:pServiceName =
"com.sun.star.form.component.ScrollBar"; break;
case OControlElement::TIME: pServiceName =
"com.sun.star.form.component.DateField"; break;
case OControlElement::DATE: pServiceName =
"com.sun.star.form.component.TimeField"; break;
default: break;
@@ -2221,6 +,12 @@ namespace xmloff
}
}
+//-
+::rtl::OUString OFormImport::determineDefaultServiceName() const
+{
+return ::rtl::OUString::createFromAscii(
"com.sun.star.form.component.Form" );
+}
+
//.
} // namespace xmloff
//.
diff --git a/xmloff/source/forms/elementimport.hxx
b/xmloff/source/forms/elementimport.hxx
index dacda2e..eb04e84 100644
--- a/xmloff/source/forms/elementimport.hxx
+++ b/xmloff/source/forms/elementimport.hxx
@@ -740,7 +740,7 @@ namespace xmloff
sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName,
OControlElement::ElementType _eType );
-
+virtual ::rtl::OUString determineDefaultServiceName() const;
void implTranslateStringListProperty(const ::rtl::OUString&
_rPropertyName, const ::rtl::OUString& _rValue);
};
commit 459c1d18f71552db70b349ef50828142cd6f744f
Author: Tsutomu Uchino
Date: Sat Jan 31 06:50:26 2015 +
#i116863# remove extra spaces from labels of line spacing commands
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 0a17cdb..d4b350f 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -4832,7 +4832,7 @@
-Line Spacing : 1.5
+Line Spacing: 1.5
15
@@ -4840,7 +4840,7 @@
-Line Spacing : 2
+Line Spacing: 2
15
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sc/source
sc/source/ui/dbgui/dapidata.cxx |4 ++--
sc/source/ui/dbgui/dapitype.src | 10 +-
sc/source/ui/inc/dapidata.hxx |4 ++--
3 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 8254a15eafde7a1b666b02967758fef45a5cf32c
Author: Tsutomu Uchino
Date: Fri Jan 30 17:41:05 2015 +
#i105692# rearrange the order of the controls and fix name of type
diff --git a/sc/source/ui/dbgui/dapidata.cxx b/sc/source/ui/dbgui/dapidata.cxx
index 0998e66..fd8786b 100644
--- a/sc/source/ui/dbgui/dapidata.cxx
+++ b/sc/source/ui/dbgui/dapidata.cxx
@@ -68,10 +68,10 @@ ScDataPilotDatabaseDlg::ScDataPilotDatabaseDlg( Window*
pParent ) :
aFlFrame( this, ScResId( FL_FRAME ) ),
aFtDatabase ( this, ScResId( FT_DATABASE ) ),
aLbDatabase ( this, ScResId( LB_DATABASE ) ),
-aFtObject ( this, ScResId( FT_OBJECT ) ),
-aCbObject ( this, ScResId( CB_OBJECT ) ),
aFtType ( this, ScResId( FT_OBJTYPE ) ),
aLbType ( this, ScResId( LB_OBJTYPE ) ),
+aFtObject ( this, ScResId( FT_OBJECT ) ),
+aCbObject ( this, ScResId( CB_OBJECT ) ),
aBtnOk ( this, ScResId( BTN_OK ) ),
aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
aBtnHelp( this, ScResId( BTN_HELP ) )
diff --git a/sc/source/ui/dbgui/dapitype.src b/sc/source/ui/dbgui/dapitype.src
index aeafa4a..967 100644
--- a/sc/source/ui/dbgui/dapitype.src
+++ b/sc/source/ui/dbgui/dapitype.src
@@ -247,7 +247,7 @@ ModalDialog RID_SCDLG_DAPIDATA
FixedText FT_OBJECT
{
-Pos = MAP_APPFONT ( 12 , 30 ) ;
+Pos = MAP_APPFONT ( 12 , 46 ) ;
Size = MAP_APPFONT ( 52 , 8 ) ;
Text [ en-US ] = "Data so~urce";
};
@@ -255,7 +255,7 @@ ModalDialog RID_SCDLG_DAPIDATA
{
HelpID = "sc:ComboBox:RID_SCDLG_DAPIDATA:CB_OBJECT";
Border = TRUE ;
-Pos = MAP_APPFONT ( 66 , 28 ) ;
+Pos = MAP_APPFONT ( 66 , 44 ) ;
Size = MAP_APPFONT ( 110 , 80 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
@@ -263,7 +263,7 @@ ModalDialog RID_SCDLG_DAPIDATA
FixedText FT_OBJTYPE
{
-Pos = MAP_APPFONT ( 12 , 46 ) ;
+Pos = MAP_APPFONT ( 12 , 30 ) ;
Size = MAP_APPFONT ( 52 , 8 ) ;
Text [ en-US ] = "~Type";
};
@@ -271,13 +271,13 @@ ModalDialog RID_SCDLG_DAPIDATA
{
HelpID = "sc:ListBox:RID_SCDLG_DAPIDATA:LB_OBJTYPE";
Border = TRUE ;
-Pos = MAP_APPFONT ( 66 , 44 ) ;
+Pos = MAP_APPFONT ( 66 , 28 ) ;
Size = MAP_APPFONT ( 110 , 80 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
StringList [ en-US ] =
{
-< "Sheet" ; Default ; > ;
+< "Table" ; Default ; > ;
< "Query" ; Default ; > ;
< "Sql" ; Default ; > ;
< "Sql [Native]" ; Default ; > ;
diff --git a/sc/source/ui/inc/dapidata.hxx b/sc/source/ui/inc/dapidata.hxx
index 03b4e66..20bc58f 100644
--- a/sc/source/ui/inc/dapidata.hxx
+++ b/sc/source/ui/inc/dapidata.hxx
@@ -43,10 +43,10 @@ private:
FixedLine aFlFrame;
FixedText aFtDatabase;
ListBox aLbDatabase;
-FixedText aFtObject;
-ComboBoxaCbObject;
FixedText aFtType;
ListBox aLbType;
+FixedText aFtObject;
+ComboBoxaCbObject;
OKButtonaBtnOk;
CancelButtonaBtnCancel;
HelpButton aBtnHelp;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extensions/inc extensions/source
extensions/inc/propctrlr.hrc |1 + extensions/source/propctrlr/formmetadata.cxx |2 +- 2 files changed, 2 insertions(+), 1 deletion(-) New commits: commit 68deef115925c60513b42af9bc4e6df24b49dd2d Author: Tsutomu Uchino Date: Fri Jan 30 14:12:27 2015 + Resolves: #i67663# add vertical alighment on property UI (cherry picked from commit 2b2128d0665dc390ae90739c84bc387f399ebe87) Conflicts: extensions/source/propctrlr/formmetadata.cxx Change-Id: Ic6d708454009e8023dc2e601043409377fd6cb34 diff --git a/extensions/inc/propctrlr.hrc b/extensions/inc/propctrlr.hrc index da26a11..3709f7d 100644 --- a/extensions/inc/propctrlr.hrc +++ b/extensions/inc/propctrlr.hrc @@ -125,6 +125,7 @@ #define HID_PROP_LINECOLOR "EXTENSIONS_HID_PROP_LINECOLOR" #define HID_PROP_BORDER "EXTENSIONS_HID_PROP_BORDER" #define HID_PROP_ALIGN "EXTENSIONS_HID_PROP_ALIGN" +#define HID_PROP_VERTICAL_ALIGN "EXTENSIONS_HID_PROP_VERTICAL_ALIGN" #define HID_PROP_DROPDOWN "EXTENSIONS_HID_PROP_DROPDOWN" #define HID_PROP_MULTILINE "EXTENSIONS_HID_PROP_MULTILINE" #define HID_PROP_HSCROLL "EXTENSIONS_HID_PROP_HSCROLL" diff --git a/extensions/source/propctrlr/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx index 4dcd046..ea2d2aa 100644 --- a/extensions/source/propctrlr/formmetadata.cxx +++ b/extensions/source/propctrlr/formmetadata.cxx @@ -281,7 +281,7 @@ namespace pcr DEF_INFO_3( FONT, FONT, 142, FONT, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ), DEF_INFO_4( VISUALEFFECT, VISUALEFFECT, 143, VISUALEFFECT, FORM_VISIBLE, DIALOG_VISIBLE, ENUM_ONE, COMPOSEABLE ), DEF_INFO_4( ALIGN, ALIGN, 144, ALIGN, FORM_VISIBLE, DIALOG_VISIBLE, ENUM, COMPOSEABLE ), -DEF_INFO_3( VERTICAL_ALIGN,VERTICAL_ALIGN, 145, VERTICAL_ALIGN,FORM_VISIBLE, ENUM, COMPOSEABLE ), +DEF_INFO_4( VERTICAL_ALIGN,VERTICAL_ALIGN, 145, VERTICAL_ALIGN,FORM_VISIBLE, DIALOG_VISIBLE, ENUM, COMPOSEABLE ), DEF_INFO_3( ROWHEIGHT, ROWHEIGHT, 146, ROWHEIGHT, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ), DEF_INFO_3( BACKGROUNDCOLOR, BACKGROUNDCOLOR,147, BACKGROUNDCOLOR, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ), DEF_INFO_3( SYMBOLCOLOR, SYMBOLCOLOR,148, SYMBOLCOLOR, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ), ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - extensions/inc extensions/source
extensions/inc/propctrlr.hrc |1 + extensions/source/propctrlr/formmetadata.cxx |2 +- 2 files changed, 2 insertions(+), 1 deletion(-) New commits: commit 2b2128d0665dc390ae90739c84bc387f399ebe87 Author: Tsutomu Uchino Date: Fri Jan 30 14:12:27 2015 + #i67663# add vertical alighment on property UI diff --git a/extensions/inc/propctrlr.hrc b/extensions/inc/propctrlr.hrc index d7ea76e..92daa7d 100644 --- a/extensions/inc/propctrlr.hrc +++ b/extensions/inc/propctrlr.hrc @@ -129,6 +129,7 @@ #define HID_PROP_LINECOLOR "EXTENSIONS_HID_PROP_LINECOLOR" #define HID_PROP_BORDER "EXTENSIONS_HID_PROP_BORDER" #define HID_PROP_ALIGN "EXTENSIONS_HID_PROP_ALIGN" +#define HID_PROP_VERTICAL_ALIGN "EXTENSIONS_HID_PROP_VERTICAL_ALIGN" #define HID_PROP_DROPDOWN "EXTENSIONS_HID_PROP_DROPDOWN" #define HID_PROP_MULTILINE "EXTENSIONS_HID_PROP_MULTILINE" #define HID_PROP_HSCROLL "EXTENSIONS_HID_PROP_HSCROLL" diff --git a/extensions/source/propctrlr/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx index 3a8256c..0cbf515 100644 --- a/extensions/source/propctrlr/formmetadata.cxx +++ b/extensions/source/propctrlr/formmetadata.cxx @@ -296,7 +296,7 @@ namespace pcr DEF_INFO_3( FONT, FONT, FONT, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ), DEF_INFO_4( VISUALEFFECT, VISUALEFFECT, VISUALEFFECT, FORM_VISIBLE, DIALOG_VISIBLE, ENUM_ONE, COMPOSEABLE ), DEF_INFO_4( ALIGN, ALIGN, ALIGN, FORM_VISIBLE, DIALOG_VISIBLE, ENUM, COMPOSEABLE ), -DEF_INFO_3( VERTICAL_ALIGN,VERTICAL_ALIGN, VERTICAL_ALIGN, FORM_VISIBLE, ENUM, COMPOSEABLE ), +DEF_INFO_4( VERTICAL_ALIGN,VERTICAL_ALIGN, VERTICAL_ALIGN, FORM_VISIBLE, DIALOG_VISIBLE, ENUM, COMPOSEABLE ), DEF_INFO_3( ROWHEIGHT, ROWHEIGHT, ROWHEIGHT, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ), DEF_INFO_3( BACKGROUNDCOLOR, BACKGROUNDCOLOR,BACKGROUNDCOLOR, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ), DEF_INFO_3( SYMBOLCOLOR, SYMBOLCOLOR,SYMBOLCOLOR, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ), ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sc/inc sc/source
sc/inc/ViewSettingsSequenceDefines.hxx | 17 +
sc/source/ui/view/viewdata.cxx |4
2 files changed, 13 insertions(+), 8 deletions(-)
New commits:
commit d3fb83cbaea17418def1ace6e868d8892d64d85d
Author: Tsutomu Uchino
Date: Tue Jan 27 13:25:47 2015 +
#i85241# store settings about value highlighting in document
diff --git a/sc/inc/ViewSettingsSequenceDefines.hxx
b/sc/inc/ViewSettingsSequenceDefines.hxx
index bb45344..a77303a 100644
--- a/sc/inc/ViewSettingsSequenceDefines.hxx
+++ b/sc/inc/ViewSettingsSequenceDefines.hxx
@@ -27,7 +27,7 @@
// this are the defines for the position of the settings in the
// ViewSettingsSequence
-#define SC_VIEWSETTINGS_COUNT 23
+#define SC_VIEWSETTINGS_COUNT 24
#define SC_VIEW_ID 0
#define SC_TABLE_VIEWSETTINGS 1
@@ -45,13 +45,14 @@
#define SC_COLROWHDR13
#define SC_SHEETTABS14
#define SC_OUTLSYMB 15
-#define SC_SNAPTORASTER 16
-#define SC_RASTERVIS17
-#define SC_RASTERRESX 18
-#define SC_RASTERRESY 19
-#define SC_RASTERSUBX 20
-#define SC_RASTERSUBY 21
-#define SC_RASTERSYNC 22
+#define SC_VALUE_HIGHLIGHTING 16
+#define SC_SNAPTORASTER 17
+#define SC_RASTERVIS18
+#define SC_RASTERRESX 19
+#define SC_RASTERRESY 20
+#define SC_RASTERSUBX 21
+#define SC_RASTERSUBY 22
+#define SC_RASTERSYNC 23
// this are the defines for the position of the settings in the
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 8c09eee..1ef28b5 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -2766,6 +2766,8 @@ void ScViewData::WriteUserDataSequence(uno::Sequence
& rSe
ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_SHEETTABS].Value,
pOptions->GetOption( VOPT_TABCONTROLS ) );
pSettings[SC_OUTLSYMB].Name =
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_OUTLSYMB));
ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_OUTLSYMB].Value,
pOptions->GetOption( VOPT_OUTLINER ) );
+pSettings[SC_VALUE_HIGHLIGHTING].Name = rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( SC_UNO_VALUEHIGH ) );
+ScUnoHelpFunctions::SetBoolInAny(
pSettings[SC_VALUE_HIGHLIGHTING].Value, pOptions->GetOption( VOPT_SYNTAX ) );
const ScGridOptions& aGridOpt = pOptions->GetGridOptions();
pSettings[SC_SNAPTORASTER].Name =
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_SNAPTORASTER));
@@ -2916,6 +2918,8 @@ void ScViewData::ReadUserDataSequence(const uno::Sequence
if ( rSettings[i].Value >>= nTemp16 )
pOptions->SetObjMode( VOBJ_TYPE_DRAW, (nTemp16 == 1) ?
VOBJ_MODE_HIDE : VOBJ_MODE_SHOW );
}
+else if ( sName.compareToAscii( SC_UNO_VALUEHIGH ) == 0 )
+pOptions->SetOption( VOPT_SYNTAX,
ScUnoHelpFunctions::GetBoolFromAny( rSettings[i].Value ) );
else
{
ScGridOptions aGridOpt(pOptions->GetGridOptions());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - toolkit/source xmlscript/dtd xmlscript/source
toolkit/source/helper/property.cxx |2 -
xmlscript/dtd/dialog.dtd |1
xmlscript/source/xmldlg_imexp/exp_share.hxx|2 +
xmlscript/source/xmldlg_imexp/imp_share.hxx|3 +
xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx |2 +
xmlscript/source/xmldlg_imexp/xmldlg_export.cxx| 31 +
xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx |3 +
xmlscript/source/xmldlg_imexp/xmldlg_import.cxx| 38 +
8 files changed, 81 insertions(+), 1 deletion(-)
New commits:
commit 350c4f9a01b88d4fd1006465151348ac5d459f1a
Author: Tsutomu Uchino
Date: Mon Jan 26 09:06:52 2015 +
#i98734# store and load ScaleMode property of image control on dialogs
Suggested by: Frank Schönheit
diff --git a/toolkit/source/helper/property.cxx
b/toolkit/source/helper/property.cxx
index 830cc32..aeb4c37 100644
--- a/toolkit/source/helper/property.cxx
+++ b/toolkit/source/helper/property.cxx
@@ -217,7 +217,7 @@ ImplPropertyInfo* ImplGetPropertyInfos( sal_uInt16&
rElementCount )
DECL_PROP_2 ( "AutoRepeat", AUTO_REPEAT,
sal_Bool, BOUND, MAYBEDEFAULT ),
DECL_PROP_2 ( "RepeatDelay",REPEAT_DELAY,
sal_Int32, BOUND, MAYBEDEFAULT ),
DECL_PROP_2 ( "ScaleImage", SCALEIMAGE,
bool, BOUND, MAYBEDEFAULT ),
-DECL_PROP_2 ( "ScaleMode", IMAGE_SCALE_MODE,
sal_Int16, BOUND, MAYBEDEFAULT ),
+DECL_DEP_PROP_2 ( "ScaleMode", IMAGE_SCALE_MODE,
sal_Int16, BOUND, MAYBEDEFAULT ),
DECL_DEP_PROP_3 ( "ScrollValue",SCROLLVALUE,
sal_Int32, BOUND, MAYBEDEFAULT, MAYBEVOID ),
DECL_PROP_2 ( "ScrollValueMax", SCROLLVALUE_MAX,
sal_Int32, BOUND, MAYBEDEFAULT ),
DECL_PROP_2 ( "ScrollValueMin", SCROLLVALUE_MIN,
sal_Int32, BOUND, MAYBEDEFAULT ),
diff --git a/xmlscript/dtd/dialog.dtd b/xmlscript/dtd/dialog.dtd
index 56525f0..414521e 100644
--- a/xmlscript/dtd/dialog.dtd
+++ b/xmlscript/dtd/dialog.dtd
@@ -247,6 +247,7 @@
diff --git a/xmlscript/source/xmldlg_imexp/exp_share.hxx
b/xmlscript/source/xmldlg_imexp/exp_share.hxx
index 37ea633a..1e2bdaa 100644
--- a/xmlscript/source/xmldlg_imexp/exp_share.hxx
+++ b/xmlscript/source/xmldlg_imexp/exp_share.hxx
@@ -153,6 +153,8 @@ public:
::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName );
void readSelectionTypeAttr(
::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName );
+void readImageScaleModeAttr(
+::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName );
//
inline void addBoolAttr(
::rtl::OUString const & rAttrName, sal_Bool bValue )
diff --git a/xmlscript/source/xmldlg_imexp/imp_share.hxx
b/xmlscript/source/xmldlg_imexp/imp_share.hxx
index 1ef84a0..922e485 100644
--- a/xmlscript/source/xmldlg_imexp/imp_share.hxx
+++ b/xmlscript/source/xmldlg_imexp/imp_share.hxx
@@ -447,6 +447,9 @@ public:
bool importSelectionTypeProperty(
::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName,
css::uno::Reference const & xAttributes
);
+bool importImageScaleModeProperty(
+::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName,
+css::uno::Reference const & xAttributes
);
};
//==
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
index 46b1b01..a021e19 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
@@ -591,6 +591,8 @@ void ElementDescriptor::readImageControlModel( StyleBag *
all_styles )
readDefaults();
readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("ScaleImage") ),
OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX
":scale-image") ) );
+readImageScaleModeAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("ScaleMode")
),
+ OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX
":scale-mode") ) );
readStringAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("ImageURL") ),
OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX
":src") ) );
readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("Tabstop") ),
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
index 3485138..64ca41a 100644
--- a/xmlscript/source/xmldlg_imexp/xmld
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sc/source
sc/source/core/data/table6.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 6e002280f89b1ed583686038567cbb010a4758f1
Author: Tsutomu Uchino
Date: Thu Jan 22 17:53:09 2015 +
#i107619# update search result while repeating search
diff --git a/sc/source/core/data/table6.cxx b/sc/source/core/data/table6.cxx
index 8293b5f..f9e229f 100644
--- a/sc/source/core/data/table6.cxx
+++ b/sc/source/core/data/table6.cxx
@@ -194,13 +194,13 @@ sal_Bool ScTable::SearchCell(const SvxSearchItem&
rSearchItem, SCCOL nCol, SCROW
else if (bDoBack)
{
xub_StrLen nTemp=nStart; nStart=nEnd; nEnd=nTemp;
-bRepeat =
((sal_Bool)(pSearchText->SearchBkwrd(aString, &nStart, &nEnd)));
+bRepeat =
((sal_Bool)(pSearchText->SearchBkwrd(aString, &nStart, &nEnd, &aSearchResult)));
// change results to definition before 614:
--nEnd;
}
else
{
-bRepeat =
((sal_Bool)(pSearchText->SearchFrwrd(aString, &nStart, &nEnd)));
+bRepeat =
((sal_Bool)(pSearchText->SearchFrwrd(aString, &nStart, &nEnd, &aSearchResult)));
// change results to definition before 614:
--nEnd;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d8915be647a85e6c20763febc28f015e6e11c688 Author: Tsutomu Uchino Date: Mon Jan 19 17:12:22 2015 + Resolves: #i116863# remove the extra space before colon... in the label for date number format (cherry picked from commit 2c11fc40e0500da7fc217e1bc1290adfdccab82f) Conflicts: officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu Change-Id: I8e5b6a141948fbce8361b74a3f29db3cdf7d71f4 diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu index 758b2d0..979bc8d 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu @@ -1663,7 +1663,7 @@ - Number Format : Date + Number Format: Date 1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 2c11fc40e0500da7fc217e1bc1290adfdccab82f Author: Tsutomu Uchino Date: Mon Jan 19 17:12:22 2015 + #i116863# remove the extra space before colon in the label for date number format diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index fbdbdbb..0a17cdb 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -3813,7 +3813,7 @@ -Number Format : Date +Number Format: Date 1 commit f1c5f03d2e6e93739538b0f8afb7a0babaf62dd0 Author: Tsutomu Uchino Date: Mon Jan 19 17:10:34 2015 + #i28353# add leading dots for a label Floating Frame diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index 75affea..fbdbdbb 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -3311,7 +3311,7 @@ -Float~ing Frame +Float~ing Frame... 1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - offapi/com sw/source
offapi/com/sun/star/util/XProtectable.idl |8
sw/source/core/doc/docredln.cxx | 26 ++
2 files changed, 30 insertions(+), 4 deletions(-)
New commits:
commit b698b9362b1a4ab58e0307a20f65dea796087344
Author: Tsutomu Uchino
Date: Fri Jan 16 17:02:52 2015 +
Related: #i34459# add description about IllegalArgumentException...
thrown by unprotect method and about some arguments
(cherry picked from commit abaff3a9330500a7394767081bfb52788028ff0c)
Change-Id: I3ee203279647a506e6cb860387aac3e4379c9c75
diff --git a/offapi/com/sun/star/util/XProtectable.idl
b/offapi/com/sun/star/util/XProtectable.idl
index 06eaa62..62e8b12 100644
--- a/offapi/com/sun/star/util/XProtectable.idl
+++ b/offapi/com/sun/star/util/XProtectable.idl
@@ -33,10 +33,18 @@ module com { module sun { module star { module util {
published interface XProtectable: com::sun::star::uno::XInterface
{
/** activates the protection.
+
+@param aPassword
+a string to specify new password.
*/
void protect( [in] string aPassword );
/** removes the protection.
+
+@param aPassword
+a string to match with the current password.
+@throws com::sun::star::lang::IllegalArgumentException
+if invalid password is specified.
*/
void unprotect( [in] string aPassword )
raises( com::sun::star::lang::IllegalArgumentException );
commit 36e158ce7a0effb130936ba4598a193102faa6a1
Author: Caolán McNamara
Date: Mon Jan 19 12:09:17 2015 +
if we change the keys we have to resort based on the new keys
Change-Id: Ied95c2d1490554d9ba5402c936a9720c8a325771
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 960a15d..b2f1eea 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -1336,6 +1336,8 @@ void SwRangeRedline::MoveFromSection()
SwDoc* pDoc = GetDoc();
const SwRedlineTbl& rTbl =
pDoc->getIDocumentRedlineAccess().GetRedlineTbl();
std::vector aBeforeArr, aBehindArr;
+typedef std::map IndexAndRange;
+IndexAndRange aIndexAndRangeMap;
sal_uInt16 nMyPos = rTbl.GetPos( this );
OSL_ENSURE( this, "this is not in the array?" );
bool bBreak = false;
@@ -1346,12 +1348,16 @@ void SwRangeRedline::MoveFromSection()
bBreak = true;
if( rTbl[ n ]->GetBound(true) == *GetPoint() )
{
-aBehindArr.push_back( &rTbl[ n ]->GetBound(true) );
+SwRangeRedline* pRedl = rTbl[n];
+aBehindArr.push_back(&pRedl->GetBound(true));
+aIndexAndRangeMap.insert(std::make_pair(n, pRedl));
bBreak = false;
}
if( rTbl[ n ]->GetBound(false) == *GetPoint() )
{
-aBehindArr.push_back( &rTbl[ n ]->GetBound(false) );
+SwRangeRedline* pRedl = rTbl[n];
+aBehindArr.push_back(&pRedl->GetBound(false));
+aIndexAndRangeMap.insert(std::make_pair(n, pRedl));
bBreak = false;
}
}
@@ -1361,12 +1367,16 @@ void SwRangeRedline::MoveFromSection()
bBreak = true;
if( rTbl[ n ]->GetBound(true) == *GetPoint() )
{
-aBeforeArr.push_back( &rTbl[ n ]->GetBound(true) );
+SwRangeRedline* pRedl = rTbl[n];
+aBeforeArr.push_back(&pRedl->GetBound(true));
+aIndexAndRangeMap.insert(std::make_pair(n, pRedl));
bBreak = false;
}
if( rTbl[ n ]->GetBound(false) == *GetPoint() )
{
-aBeforeArr.push_back( &rTbl[ n ]->GetBound(false) );
+SwRangeRedline* pRedl = rTbl[n];
+aBeforeArr.push_back(&pRedl->GetBound(false));
+aIndexAndRangeMap.insert(std::make_pair(n, pRedl));
bBreak = false;
}
}
@@ -1420,6 +1430,7 @@ void SwRangeRedline::MoveFromSection()
if( pColl && pCNd )
pCNd->ChgFmtColl( pColl );
}
+
// #i95771#
// Under certain conditions the previous has already
// removed the change tracking section of this
instance from
@@ -1440,6 +1451,13 @@ void SwRangeRedline::MoveFromSection()
*aBeforeArr[ n ] = *Start();
for( n = 0; n < aBehindArr.size(); ++n )
*aBehindArr[ n ] = *End();
+SwRedlineTbl& rResortTbl = const_cast(rTbl);
+for (auto& a : aIndexAndRangeMap)
+{
+// re-insert
+rResortTbl.Remove(a.first);
+rResortTbl.Insert(a.second);
+}
}
else
InvalidateRange();
___
Libr
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - offapi/com
offapi/com/sun/star/util/XProtectable.idl |8
1 file changed, 8 insertions(+)
New commits:
commit abaff3a9330500a7394767081bfb52788028ff0c
Author: Tsutomu Uchino
Date: Fri Jan 16 17:02:52 2015 +
#i34459# add description about IllegalArgumentException thrown by unprotect
method and about some arguments
diff --git a/offapi/com/sun/star/util/XProtectable.idl
b/offapi/com/sun/star/util/XProtectable.idl
index d794e90..6bb590a 100644
--- a/offapi/com/sun/star/util/XProtectable.idl
+++ b/offapi/com/sun/star/util/XProtectable.idl
@@ -44,11 +44,19 @@ published interface XProtectable:
com::sun::star::uno::XInterface
{
//-
/** activates the protection.
+
+@param aPassword
+a string to specify new password.
*/
void protect( [in] string aPassword );
//-
/** removes the protection.
+
+@param aPassword
+a string to match with the current password.
+@throws com::sun::star::lang::IllegalArgumentException
+if invalid password is specified.
*/
void unprotect( [in] string aPassword )
raises( com::sun::star::lang::IllegalArgumentException );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sc/source
sc/source/ui/docshell/externalrefmgr.cxx |7 --- 1 file changed, 4 insertions(+), 3 deletions(-) New commits: commit 82f67031551c3e153b5977d2cc40ce68dda68ba0 Author: Tsutomu Uchino Date: Thu Jan 15 18:14:41 2015 + #i117843# avoid shrinking the range from external file until the matrix supports gap from the original range diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index 62b3c3e..057237f 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -1369,10 +1369,11 @@ static ScTokenArray* lcl_convertToTokenArray(ScDocument* pSrcDoc, ScRange& rRang // Only loop within the data area. SCCOL nDataCol1 = nCol1, nDataCol2 = nCol2; SCROW nDataRow1 = nRow1, nDataRow2 = nRow2; -bool bShrunk; -if (!pSrcDoc->ShrinkToUsedDataArea( bShrunk, nTab, nDataCol1, nDataRow1, nDataCol2, nDataRow2, false)) +// the matrix for shrunken data range gives invalid match until the matrix supports the gap +//bool bShrunk; +//if (!pSrcDoc->ShrinkToUsedDataArea( bShrunk, nTab, nDataCol1, nDataRow1, nDataCol2, nDataRow2, false)) // no data within specified range. -continue; +//continue; if (pUsedRange.get()) // Make sure the used area only grows, not shrinks. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: offapi/com
offapi/com/sun/star/sheet/SheetCell.idl |3 +++ 1 file changed, 3 insertions(+) New commits: commit 97507ca728376e74c1092f8eccf431bd49cd4368 Author: Tsutomu Uchino Date: Wed Jan 14 15:17:21 2015 + Related: #i20542# add description about getTextFieldMasters... always returning void on this service (cherry picked from commit 938544d04f9802036400a533da8cc818db02bdad) Change-Id: I2d6217f0c8e1eb9631a6549f4ff1a46644431cc1 diff --git a/offapi/com/sun/star/sheet/SheetCell.idl b/offapi/com/sun/star/sheet/SheetCell.idl index 17c5c91..77411c4 100644 --- a/offapi/com/sun/star/sheet/SheetCell.idl +++ b/offapi/com/sun/star/sheet/SheetCell.idl @@ -141,6 +141,9 @@ published service SheetCell /** provides access to the text fields used in this cell. + +With com::sun::star::text::XTextFieldsSupplier::getTextFieldMasters +always returns void since the field master is not supported. */ interface com::sun::star::text::XTextFieldsSupplier; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: offapi/com
offapi/com/sun/star/util/XNumberFormats.idl | 70 +++-
1 file changed, 69 insertions(+), 1 deletion(-)
New commits:
commit a663c789dd19aa93daf69874982b50a2da393d42
Author: Tsutomu Uchino
Date: Wed Jan 14 14:27:43 2015 +
Related: #i53565# add descriptions about parameters of member methods
(cherry picked from commit 77399fdac9a5d5a5d935ec20500247960bf739e8)
Conflicts:
offapi/com/sun/star/util/XNumberFormats.idl
Change-Id: I4046c42598dd6882e5d0a4f9b9328834aede0051
diff --git a/offapi/com/sun/star/util/XNumberFormats.idl
b/offapi/com/sun/star/util/XNumberFormats.idl
index 5df638a..7d9c0f5 100644
--- a/offapi/com/sun/star/util/XNumberFormats.idl
+++ b/offapi/com/sun/star/util/XNumberFormats.idl
@@ -33,12 +33,17 @@
/** provides access to multiple NumberFormats.
+
+The number formats are managed by their unique key in the document.
*/
published interface XNumberFormats: com::sun::star::uno::XInterface
{
/** @returns
a readonly NumberFormatProperties.
+
+@param nKey
+the key for the format
*/
com::sun::star::beans::XPropertySet getByKey( [in] long nKey );
@@ -51,7 +56,7 @@ published interface XNumberFormats:
com::sun::star::uno::XInterface
NumberFormat constants.
@param nLocale
-the language of number formats to return.
+the locale of number formats to return.
@param bCreate
`TRUE`: create new entries if no formats for the
selected language exist
@@ -63,6 +68,18 @@ published interface XNumberFormats:
com::sun::star::uno::XInterface
/** finds a number format by its format string and returns its key.
+
+@returns
+the key for the format if found, otherwise -1.
+
+@param aFormat
+the string representation of the number format
+
+@param nLocale
+the locale for number formats to find
+
+@param bScan
+reserved for future use and should be set to false
*/
long queryKey( [in] string aFormat,
[in] com::sun::star::lang::Locale nLocale,
@@ -70,6 +87,18 @@ published interface XNumberFormats:
com::sun::star::uno::XInterface
/** adds a new number format to the list, using a format string.
+
+@returns
+the key for new number format
+
+@param aFormat
+the string representation of the number format
+
+@param nLocale
+the locale for the number format
+
+@throws com::sun::star::util::MalformedNumberFormatException
+if incorrect number format is specified
*/
long addNew( [in] string aFormat,
[in] com::sun::star::lang::Locale nLocale )
@@ -79,6 +108,21 @@ published interface XNumberFormats:
com::sun::star::uno::XInterface
/** adds a new number format to the list, using a format
string in a different locale than the desired locale of the
resulting number format.
+
+@returns
+the key for added number format
+
+@param aFormat
+the key for the number format
+
+@param nLocale
+the original locale for the number format
+
+@param nNewLocale
+the new locale for the number format to be converted
+
+@throws com::sun::star::util::MalformedNumberFormatException
+if incorrect number format is specified
*/
long addNewConverted( [in] string aFormat,
[in] com::sun::star::lang::Locale nLocale,
@@ -87,12 +131,36 @@ published interface XNumberFormats:
com::sun::star::uno::XInterface
/** removes a number format from the list.
+
+@param nKey
+the key for the numberformat
*/
void removeByKey( [in] long nKey );
/** generates a format string from several parameters without
creating an actual number format.
+
+@returns
+the string representation for the number format
+
+@param nBaseKey
+the key for the number format to be used as base format
+
+@param nLocale
+the locale for the number format
+
+@param bThousands
+the thousands separator is shown or not
+
+@param bRed
+show negative number in red colored if
+
+@param nDecimals
+how many digits are shown after the decimal point
+
+@param nLeading
+how many number of leading zeros are shown
*/
string generateFormat( [in] long nBaseKey,
[in] com::sun::star::lang::Locale nLocale,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - offapi/com
offapi/com/sun/star/sheet/SheetCell.idl |3 +
offapi/com/sun/star/util/XNumberFormats.idl | 72 +++-
2 files changed, 73 insertions(+), 2 deletions(-)
New commits:
commit 938544d04f9802036400a533da8cc818db02bdad
Author: Tsutomu Uchino
Date: Wed Jan 14 15:17:21 2015 +
#i20542# add description about getTextFieldMasters returns always void on
this service
diff --git a/offapi/com/sun/star/sheet/SheetCell.idl
b/offapi/com/sun/star/sheet/SheetCell.idl
index b1097ef..07f33e3 100644
--- a/offapi/com/sun/star/sheet/SheetCell.idl
+++ b/offapi/com/sun/star/sheet/SheetCell.idl
@@ -226,6 +226,9 @@ published service SheetCell
//-
/** provides access to the text fields used in this cell.
+
+XTextFieldsSupplier::getTextFieldMasters
+returns always since the field master is not supported.
*/
interface com::sun::star::text::XTextFieldsSupplier;
commit 77399fdac9a5d5a5d935ec20500247960bf739e8
Author: Tsutomu Uchino
Date: Wed Jan 14 14:27:43 2015 +
#i53565# add descriptions about parameters of member methods
diff --git a/offapi/com/sun/star/util/XNumberFormats.idl
b/offapi/com/sun/star/util/XNumberFormats.idl
index 795f059..578787f 100644
--- a/offapi/com/sun/star/util/XNumberFormats.idl
+++ b/offapi/com/sun/star/util/XNumberFormats.idl
@@ -47,6 +47,8 @@
//=
/** provides access to multiple NumberFormats.
+
+The number formats are managed by their unique key in the document.
*/
published interface XNumberFormats: com::sun::star::uno::XInterface
{
@@ -54,6 +56,9 @@ published interface XNumberFormats:
com::sun::star::uno::XInterface
/** @returns
a readonly NumberFormatProperties.
+
+@param nKey
+the key for the format
*/
com::sun::star::beans::XPropertySet getByKey( [in] long nKey );
@@ -66,8 +71,8 @@ published interface XNumberFormats:
com::sun::star::uno::XInterface
the type of number formats to return. Must be one of
the
NumberFormat constants.
-@param nLanguage
-the language of number formats to return.
+@param nLocale
+the locale of number formats to return.
@param bCreate
: create new entries if no formats for the
selected language exist
@@ -80,6 +85,18 @@ published interface XNumberFormats:
com::sun::star::uno::XInterface
//-
/** finds a number format by its format string and returns its key.
+
+@returns
+the key for the format if found, otherwise -1.
+
+@param aFormat
+the string representation of the number format
+
+@param nLocale
+the locale for number formats to find
+
+@param bScan
+reserved for future use and should be set to false
*/
long queryKey( [in] string aFormat,
[in] com::sun::star::lang::Locale nLocale,
@@ -88,6 +105,18 @@ published interface XNumberFormats:
com::sun::star::uno::XInterface
//-
/** adds a new number format to the list, using a format string.
+
+@returns
+the key for new number format
+
+@param aFormat
+the string representation of the number format
+
+@param nLocale
+the locale for the number format
+
+@throws com::sun::star::util::MalformedNumberFormatException
+if incorrect number format is specified
*/
long addNew( [in] string aFormat,
[in] com::sun::star::lang::Locale nLocale )
@@ -98,6 +127,21 @@ published interface XNumberFormats:
com::sun::star::uno::XInterface
/** adds a new number format to the list, using a format
string in a different locale than the desired locale of the
resulting number format.
+
+@returns
+the key for added number format
+
+@param aFormat
+the key for the number format
+
+@param nLocale
+the original locale for the number format
+
+@param nNewLocale
+the new locale for the number format to be converted
+
+@throws com::sun::star::util::MalformedNumberFormatException
+if incorrect number format is specified
*/
long addNewConverted( [in] string aFormat,
[in] com::sun::star::lang::Locale nLocale,
@@ -107,6 +151,9 @@ published interface XNumberFormats:
com::sun::star::uno::XInterface
//-
/** removes a number format from the list.
+
+@param nKey
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - vcl/unx
vcl/unx/gtk/window/gtkframe.cxx | 28 ++--
1 file changed, 18 insertions(+), 10 deletions(-)
New commits:
commit 19654ce3a9fadebe9bf978e89cc2ac1ab5ebb80a
Author: Tsutomu Uchino
Date: Wed Jan 14 08:20:05 2015 +
#i125991# catch IndexOutOfBoundsException to avoid fatal error happen when
input method is used on Gtk environment
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index 972f24b..afa557d 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -3749,17 +3749,25 @@ uno::Reference
return
uno::Reference(xContext,
uno::UNO_QUERY);
}
-for (sal_Int32 i = 0; i < xContext->getAccessibleChildCount(); ++i)
+try
{
-uno::Reference< accessibility::XAccessible > xChild =
xContext->getAccessibleChild(i);
-if (!xChild.is())
-continue;
-uno::Reference< accessibility::XAccessibleContext > xChildContext
= xChild->getAccessibleContext();
-if (!xChildContext.is())
-continue;
-uno::Reference< accessibility::XAccessibleEditableText > xText =
FindFocus(xChildContext);
-if (xText.is())
-return xText;
+for (sal_Int32 i = 0, n = xContext->getAccessibleChildCount(); i < n;
++i)
+{
+uno::Reference< accessibility::XAccessible > xChild =
xContext->getAccessibleChild(i);
+if (!xChild.is())
+continue;
+uno::Reference< accessibility::XAccessibleContext >
xChildContext = xChild->getAccessibleContext();
+if (!xChildContext.is())
+continue;
+uno::Reference< accessibility::XAccessibleEditableText > xText =
FindFocus(xChildContext);
+if (xText.is())
+return xText;
+}
+}
+catch( lang::IndexOutOfBoundsException & e )
+{
+OSL_TRACE( "GtkFrame FindFocus, %s", ::rtl::OUStringToOString(
+e.Message, RTL_TEXTENCODING_UTF8 ).pData->buffer );
}
return uno::Reference< accessibility::XAccessibleEditableText >();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basctl/source
basctl/source/basicide/baside2b.cxx |9 -
1 file changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 15d2655fb68254f39c59b97a7ca7713d12b0f1fa
Author: Tsutomu Uchino
Date: Mon Jan 12 14:39:39 2015 +
Resolves: #i120772# do not ignore last three properties...
when special properties not found in watching window
(cherry picked from commit 8815f3f3fbb3632cccbbf8476f4c40c9bda8eb6e)
Conflicts:
basctl/source/basicide/baside2b.cxx
Change-Id: I6069d55b9f894846a7b4d81b981cf4523b444753
diff --git a/basctl/source/basicide/baside2b.cxx
b/basctl/source/basicide/baside2b.cxx
index be7e740..31721b1 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -2162,9 +2162,16 @@ void WatchTreeListBox::RequestingChildren(
SvTreeListEntry * pParent )
createAllObjectProperties( pObj );
SbxArray* pProps = pObj->GetProperties();
sal_uInt16 nPropCount = pProps->Count();
+if ( nPropCount >= 3 &&
+ pProps->Get( nPropCount -1 )->GetName().equalsIgnoreAsciiCase(
"Dbg_Methods" ) &&
+ pProps->Get( nPropCount -2 )->GetName().equalsIgnoreAsciiCase(
"Dbg_Properties" ) &&
+ pProps->Get( nPropCount -3 )->GetName().equalsIgnoreAsciiCase(
"Dbg_SupportedInterfaces" ) )
+{
+nPropCount -= 3;
+}
pItem->maMemberList.reserve(nPropCount);
-for( sal_uInt16 i = 0 ; i < nPropCount - 3 ; i++ )
+for( sal_uInt16 i = 0 ; i < nPropCount ; ++i )
{
SbxVariable* pVar = pProps->Get( i );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - basctl/source
basctl/source/basicide/baside2b.cxx |9 -
1 file changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 8815f3f3fbb3632cccbbf8476f4c40c9bda8eb6e
Author: Tsutomu Uchino
Date: Mon Jan 12 14:39:39 2015 +
#i120772# do not ignore last three properties when special properties not
found in watching window
diff --git a/basctl/source/basicide/baside2b.cxx
b/basctl/source/basicide/baside2b.cxx
index cb6ef05..c6a12da 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1829,9 +1829,16 @@ void WatchTreeListBox::RequestingChilds( SvLBoxEntry *
pParent )
createAllObjectProperties( pObj );
SbxArray* pProps = pObj->GetProperties();
sal_uInt16 nPropCount = pProps->Count();
+if ( nPropCount >= 3 &&
+ pProps->Get( nPropCount -1 )->GetName().EqualsIgnoreCaseAscii(
"Dbg_Methods" ) &&
+ pProps->Get( nPropCount -2 )->GetName().EqualsIgnoreCaseAscii(
"Dbg_Properties" ) &&
+ pProps->Get( nPropCount -3 )->GetName().EqualsIgnoreCaseAscii(
"Dbg_SupportedInterfaces" ) )
+ {
+nPropCount -= 3;
+ }
pItem->maMemberList.allocList( nPropCount );
-for( sal_uInt16 i = 0 ; i < nPropCount - 3 ; i++ )
+for( sal_uInt16 i = 0 ; i < nPropCount ; ++i )
{
SbxVariable* pVar = pProps->Get( i );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basic/qa basic/source
basic/qa/vba_tests/replace.vb|2 +- basic/source/runtime/methods.cxx |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit bf964151a77d8f63dac031fec5800a7bb43b3e5b Author: Tsutomu Uchino Date: Sun Jan 11 02:53:26 2015 + Related: #i94895# revert the part of revision 1650261 replaced string should be starting with the start postion if specified (cherry picked from commit 68c6265584fb6cb0469098507dd287e6e1127324) Conflicts: basic/source/runtime/methods.cxx Change-Id: Ib729facfa78ffddebc258440324f05d037fae46f diff --git a/basic/qa/vba_tests/replace.vb b/basic/qa/vba_tests/replace.vb index bd4817b..e04cde0 100644 --- a/basic/qa/vba_tests/replace.vb +++ b/basic/qa/vba_tests/replace.vb @@ -37,7 +37,7 @@ Function verify_testReplace() as String retStr = Replace(srcStr, destStr, repStr, compare:=vbTextCompare) TestLog_ASSERT retStr = "aefefdef", "text compare:" & retStr retStr = Replace(srcStr, destStr, repStr, 3, -1, vbBinaryCompare) -TestLog_ASSERT retStr = "abcefdBc", "start = 3:" & retStr +TestLog_ASSERT retStr = "cefdBc", "start = 3:" & retStr retStr = Replace(srcStr, destStr, repStr, 1, 2, vbBinaryCompare) TestLog_ASSERT retStr = "aefefdBc", "count = 2: " & retStr retStr = Replace(srcStr, destStr, repStr, 1, 0, vbBinaryCompare) diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index baa9603..113f94d 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -1414,7 +1414,7 @@ RTLFUNC(Replace) } } } -rPar.Get(0)->PutString( aExpStr ); +rPar.Get(0)->PutString( aExpStr.copy( lStartPos - 1 ) ); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - basic/source
basic/source/runtime/methods.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 68c6265584fb6cb0469098507dd287e6e1127324 Author: Tsutomu Uchino Date: Sun Jan 11 02:53:26 2015 + #i94895# revert the part of revision 1650261, replaced string should be starting with the start postion if specified diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index 6b55dad..88e1aca 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -1448,7 +1448,7 @@ RTLFUNC(Replace) } } } -rPar.Get(0)->PutString( aExpStr.Copy() ); +rPar.Get(0)->PutString( aExpStr.Copy( static_cast(lStartPos - 1) ) ); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basic/source include/basic
basic/source/comp/parser.cxx| 10 +-
basic/source/runtime/stdobj.cxx |2 +-
basic/source/sbx/sbxobj.cxx | 17 +++--
include/basic/sbxmeth.hxx |6 +-
include/basic/sbxobj.hxx|2 +-
5 files changed, 27 insertions(+), 10 deletions(-)
New commits:
commit a272f5b7b30f356418ecf28eb95d066f081d1624
Author: Tsutomu Uchino
Date: Thu Jan 8 16:28:11 2015 +
Resolves: #i63614# fix strange type mismatch when Iif function is used
Second or later compilation uses value type returned by previous execution
of code.
Use the defined type as return value of the runtime function of Basic
always.
(cherry picked from commit 7470c682e136a4a89c1e9474bbc79b2d61f31048)
Conflicts:
basic/inc/basic/sbxmeth.hxx
basic/inc/basic/sbxobj.hxx
basic/source/runtime/stdobj.cxx
basic/source/sbx/sbxobj.cxx
Change-Id: I3064e8403286a9c1401ef658bf139bedeae11f17
diff --git a/basic/source/comp/parser.cxx b/basic/source/comp/parser.cxx
index 9ce5bdb..ea2976a 100644
--- a/basic/source/comp/parser.cxx
+++ b/basic/source/comp/parser.cxx
@@ -161,7 +161,15 @@ SbiSymDef* SbiParser::CheckRTLForSym( const OUString&
rSym, SbxDataType eType )
if( pVar->IsA( TYPE(SbxMethod) ) )
{
SbiProcDef* pProc_ = aRtlSyms.AddProc( rSym );
-pProc_->SetType( pVar->GetType() );
+SbxMethod* pMethod = (SbxMethod*) pVar;
+if ( pMethod && pMethod->IsRuntimeFunction() )
+{
+pProc_->SetType( pMethod->GetRuntimeFunctionReturnType() );
+}
+else
+{
+pProc_->SetType( pVar->GetType() );
+}
pDef = pProc_;
}
else
diff --git a/basic/source/runtime/stdobj.cxx b/basic/source/runtime/stdobj.cxx
index f9f0b54..2e4f2a4 100644
--- a/basic/source/runtime/stdobj.cxx
+++ b/basic/source/runtime/stdobj.cxx
@@ -802,7 +802,7 @@ SbxVariable* SbiStdObject::Find( const OUString& rName,
SbxClassType t )
{
eCT = SbxCLASS_METHOD;
}
-pVar = Make( aName_, eCT, p->eType );
+pVar = Make( aName_, eCT, p->eType, ( p->nArgs & _FUNCTION ) ==
_FUNCTION );
pVar->SetUserData( nIndex + 1 );
pVar->SetFlags( nAccess );
}
diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx
index 35a0eb2..a7d8d4b 100644
--- a/basic/source/sbx/sbxobj.cxx
+++ b/basic/source/sbx/sbxobj.cxx
@@ -377,7 +377,7 @@ SbxArray* SbxObject::FindVar( SbxVariable* pVar,
sal_uInt16& nArrayIdx )
// If a new object will be established, this object will be indexed,
// if an object of this name exists already.
-SbxVariable* SbxObject::Make( const OUString& rName, SbxClassType ct,
SbxDataType dt )
+SbxVariable* SbxObject::Make( const OUString& rName, SbxClassType ct,
SbxDataType dt, bool bIsRuntimeFunction )
{
// Is the object already available?
SbxArray* pArray = NULL;
@@ -410,7 +410,7 @@ SbxVariable* SbxObject::Make( const OUString& rName,
SbxClassType ct, SbxDataTyp
pVar = new SbxProperty( rName, dt );
break;
case SbxCLASS_METHOD:
-pVar = new SbxMethod( rName, dt );
+pVar = new SbxMethod( rName, dt, bIsRuntimeFunction );
break;
case SbxCLASS_OBJECT:
pVar = CreateObject( rName );
@@ -964,14 +964,19 @@ void SbxObject::Dump( SvStream& rStrm, bool bFill )
--nLevel;
}
-SbxMethod::SbxMethod( const OUString& r, SbxDataType t )
-: SbxVariable( t )
+SbxMethod::SbxMethod( const OUString& r, SbxDataType t, bool
bIsRuntimeFunction )
+: SbxVariable(t)
+, mbIsRuntimeFunction(bIsRuntimeFunction)
+, mbRuntimeFunctionReturnType(t)
{
-SetName( r );
+SetName(r);
}
SbxMethod::SbxMethod( const SbxMethod& r )
-: SvRefBase( r ), SbxVariable( r )
+: SvRefBase(r)
+, SbxVariable(r)
+, mbIsRuntimeFunction(r.IsRuntimeFunction())
+, mbRuntimeFunctionReturnType(r.GetRuntimeFunctionReturnType())
{
}
diff --git a/include/basic/sbxmeth.hxx b/include/basic/sbxmeth.hxx
index 6d8be5c..e7d9cae 100644
--- a/include/basic/sbxmeth.hxx
+++ b/include/basic/sbxmeth.hxx
@@ -25,14 +25,18 @@
class BASIC_DLLPUBLIC SbxMethod : public SbxVariable
{
+bool mbIsRuntimeFunction;
+SbxDataTypembRuntimeFunctionReturnType;
public:
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_METHOD,1);
TYPEINFO_OVERRIDE();
-SbxMethod( const OUString& r, SbxDataType t );
+SbxMethod( const OUString& r, SbxDataType t, bool bIsRuntimeFunction=false
);
SbxMethod( const SbxMethod& r );
virtual ~SbxMethod();
SbxMethod& operator=( const SbxMethod& r ) { SbxVariable::operator=( r );
return *this; }
virtual SbxClassType GetClass() const SAL_OVERRIDE;
+bool IsRuntim
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - basic/inc basic/source
basic/inc/basic/sbxmeth.hxx | 11 ---
basic/inc/basic/sbxobj.hxx |2 +-
basic/source/comp/parser.cxx| 10 +-
basic/source/runtime/stdobj.cxx |2 +-
basic/source/sbx/sbxobj.cxx |4 ++--
5 files changed, 21 insertions(+), 8 deletions(-)
New commits:
commit 7470c682e136a4a89c1e9474bbc79b2d61f31048
Author: Tsutomu Uchino
Date: Thu Jan 8 16:28:11 2015 +
#i63614# fix strange type missmatch when Iif runtime function is used
Second or later compilation uses value type returned by previous execution
of code.
Use the defined type as return value of the runtime function of Basic
always.
diff --git a/basic/inc/basic/sbxmeth.hxx b/basic/inc/basic/sbxmeth.hxx
index dc25ee9..7fa7eed 100644
--- a/basic/inc/basic/sbxmeth.hxx
+++ b/basic/inc/basic/sbxmeth.hxx
@@ -31,17 +31,22 @@ class SbxMethodImpl;
class SbxMethod : public SbxVariable
{
SbxMethodImpl* mpSbxMethodImpl; // Impl data
+bool mbIsRuntimeFunction;
+SbxDataTypembRuntimeFunctionReturnType;
public:
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_METHOD,1);
TYPEINFO();
-SbxMethod( const String& r, SbxDataType t )
-: SbxVariable( t ) { SetName( r ); }
-SbxMethod( const SbxMethod& r ) : SvRefBase( r ), SbxVariable( r ) {}
+SbxMethod( const String& r, SbxDataType t, bool bIsRuntimeFunction=false )
+: SbxVariable( t ), mbIsRuntimeFunction( bIsRuntimeFunction ),
mbRuntimeFunctionReturnType( t ) { SetName( r ); }
+SbxMethod( const SbxMethod& r )
+: SvRefBase( r ), SbxVariable( r ), mbIsRuntimeFunction(
r.IsRuntimeFunction() ) {}
SbxMethod& operator=( const SbxMethod& r )
{ SbxVariable::operator=( r ); return *this; }
sal_Bool Run( SbxValues* pValues = NULL );
virtual SbxClassType GetClass() const;
+bool IsRuntimeFunction() const { return mbIsRuntimeFunction; }
+SbxDataType GetRuntimeFunctionReturnType() const{ return
mbRuntimeFunctionReturnType; }
};
#ifndef __SBX_SBXMETHODREF_HXX
diff --git a/basic/inc/basic/sbxobj.hxx b/basic/inc/basic/sbxobj.hxx
index 989ea40..f78d453 100644
--- a/basic/inc/basic/sbxobj.hxx
+++ b/basic/inc/basic/sbxobj.hxx
@@ -80,7 +80,7 @@ public:
SbxVariable* Execute( const String& );
// Manage elements
virtual sal_Bool GetAll( SbxClassType ) { return sal_True; }
-SbxVariable* Make( const String&, SbxClassType, SbxDataType );
+SbxVariable* Make( const String&, SbxClassType, SbxDataType, bool
bIsRuntimeFunction = false );
virtual SbxObject* MakeObject( const String&, const String& );
virtual void Insert( SbxVariable* );
// AB 23.4.1997, Optimization, Insertion without check for duplicate
Entries and
diff --git a/basic/source/comp/parser.cxx b/basic/source/comp/parser.cxx
index 85c4920..b06e997 100644
--- a/basic/source/comp/parser.cxx
+++ b/basic/source/comp/parser.cxx
@@ -169,7 +169,15 @@ SbiSymDef* SbiParser::CheckRTLForSym( const String& rSym,
SbxDataType eType )
if( pVar->IsA( TYPE(SbxMethod) ) )
{
SbiProcDef* pProc_ = aRtlSyms.AddProc( rSym );
-pProc_->SetType( pVar->GetType() );
+SbxMethod* pMethod = (SbxMethod*) pVar;
+if ( pMethod && pMethod->IsRuntimeFunction() )
+{
+pProc_->SetType( pMethod->GetRuntimeFunctionReturnType() );
+}
+else
+{
+pProc_->SetType( pVar->GetType() );
+}
pDef = pProc_;
}
else
diff --git a/basic/source/runtime/stdobj.cxx b/basic/source/runtime/stdobj.cxx
index 8e1058a..eb3cdcc 100644
--- a/basic/source/runtime/stdobj.cxx
+++ b/basic/source/runtime/stdobj.cxx
@@ -715,7 +715,7 @@ SbxVariable* SbiStdObject::Find( const String& rName,
SbxClassType t )
eCT = SbxCLASS_PROPERTY;
else if( nType & _METHOD )
eCT = SbxCLASS_METHOD;
-pVar = Make( aName_, eCT, p->eType );
+pVar = Make( aName_, eCT, p->eType, ( p->nArgs & _FUNCTION ) ==
_FUNCTION );
pVar->SetUserData( nIndex + 1 );
pVar->SetFlags( nAccess );
}
diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx
index 9934331..ce30eed 100644
--- a/basic/source/sbx/sbxobj.cxx
+++ b/basic/source/sbx/sbxobj.cxx
@@ -376,7 +376,7 @@ SbxArray* SbxObject::FindVar( SbxVariable* pVar,
sal_uInt16& nArrayIdx )
// Falls ein neues Objekt eingerichtet wird, wird es, falls es bereits
// eines mit diesem Namen gibt, indiziert.
-SbxVariable* SbxObject::Make( const XubString& rName, SbxClassType ct,
SbxDataType dt )
+SbxVariable* SbxObject::Make( const XubString& rName, SbxClassType ct,
SbxDataType dt, bool bIsRuntimeFunction )
{
// Ist das Objekt bereits vorhanden?
SbxArray* pArray = NULL;
@@ -422,7 +422,7 @@ SbxVariable* SbxObject::Make( c
[Libreoffice-commits] core.git: basic/source
basic/source/runtime/methods.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 340ca294d43f2c5b9fda1afbf178609a015f71e3
Author: Tsutomu Uchino
Date: Thu Jan 8 12:56:45 2015 +
Resolves: #i94895# fix illegal result of Replace runtime function
(cherry picked from commit a2700f75af61837033ff213607445cc1f74b36d6)
Conflicts:
basic/source/runtime/methods.cxx
Change-Id: If9c671a612de87d8d37bfc40704a97a6062fd150
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 7ccbab7..baa9603 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -1405,7 +1405,7 @@ RTLFUNC(Replace)
if( nPos >= 0 )
{
aExpStr = aExpStr.replaceAt( nPos, nFindStrLen,
aReplaceStr );
-nPos = nPos - nFindStrLen + nReplaceStrLen + 1;
+nPos = nPos + nReplaceStrLen;
nCounts++;
}
else
@@ -1414,7 +1414,7 @@ RTLFUNC(Replace)
}
}
}
-rPar.Get(0)->PutString( aExpStr.copy( lStartPos - 1 ) );
+rPar.Get(0)->PutString( aExpStr );
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - basic/source
basic/source/runtime/methods.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit a2700f75af61837033ff213607445cc1f74b36d6
Author: Tsutomu Uchino
Date: Thu Jan 8 12:56:45 2015 +
#i94895# fix illegal result of Replace runtime function
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index f55424c71..6b55dad 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -1439,7 +1439,7 @@ RTLFUNC(Replace)
if( nPos != STRING_NOTFOUND )
{
aExpStr.Replace( nPos, nFindStrLen, aReplaceStr );
-nPos = nPos - nFindStrLen + nReplaceStrLen + 1;
+nPos = nPos + nReplaceStrLen;
nCounts++;
}
else
@@ -1448,7 +1448,7 @@ RTLFUNC(Replace)
}
}
}
-rPar.Get(0)->PutString( aExpStr.Copy(
static_cast(lStartPos - 1) ) );
+rPar.Get(0)->PutString( aExpStr.Copy() );
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basctl/source
basctl/source/basicide/bastype2.cxx | 59 ++--
basctl/source/basicide/bastype2.hxx |2 +
2 files changed, 39 insertions(+), 22 deletions(-)
New commits:
commit c9f3c508bb1a1d94fd6172b9cdac30278559f31c
Author: Tsutomu Uchino
Date: Sat May 17 09:39:39 2014 +
Resolves: #i76558# jump by Enter key on the Object catalog
(cherry picked from commit 7bc75c1a7b05d81631ebccf05bf022636d1a3a14)
Conflicts:
basctl/source/basicide/objdlg.cxx
basctl/source/basicide/objdlg.hxx
Change-Id: Id3fa3686fd60df192c02cc8137c9bc59e68c1d49
diff --git a/basctl/source/basicide/bastype2.cxx
b/basctl/source/basicide/bastype2.cxx
index 8f848a8..9ff70c0 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -922,32 +922,47 @@ void TreeListBox::MouseButtonDown( const MouseEvent&
rMEvt )
SvTreeListBox::MouseButtonDown( rMEvt );
if ( rMEvt.IsLeft() && ( rMEvt.GetClicks() == 2 ) )
{
-EntryDescriptor aDesc = GetEntryDescriptor(GetCurEntry());
-switch (aDesc.GetType())
-{
-case OBJ_TYPE_METHOD:
-case OBJ_TYPE_MODULE:
-case OBJ_TYPE_DIALOG:
-if (SfxDispatcher* pDispatcher = GetDispatcher())
-{
-SbxItem aSbxItem(
-SID_BASICIDE_ARG_SBX, aDesc.GetDocument(),
-aDesc.GetLibName(), aDesc.GetName(),
aDesc.GetMethodName(),
-ConvertType(aDesc.GetType())
-);
-pDispatcher->Execute(
-SID_BASICIDE_SHOWSBX,
-SFX_CALLMODE_SYNCHRON, &aSbxItem, 0L
-);
-}
-break;
+OpenCurrent();
+}
+}
-default:
-break;
-}
+void TreeListBox::KeyInput( const KeyEvent& rEvt )
+{
+if ( rEvt.GetKeyCode() == KEY_RETURN && OpenCurrent() )
+{
+return;
}
+SvTreeListBox::KeyInput( rEvt );
}
+bool TreeListBox::OpenCurrent()
+{
+EntryDescriptor aDesc = GetEntryDescriptor(GetCurEntry());
+switch (aDesc.GetType())
+{
+case OBJ_TYPE_METHOD:
+case OBJ_TYPE_MODULE:
+case OBJ_TYPE_DIALOG:
+if (SfxDispatcher* pDispatcher = GetDispatcher())
+{
+SbxItem aSbxItem(
+SID_BASICIDE_ARG_SBX, aDesc.GetDocument(),
+aDesc.GetLibName(), aDesc.GetName(), aDesc.GetMethodName(),
+ConvertType(aDesc.GetType())
+);
+pDispatcher->Execute(
+SID_BASICIDE_SHOWSBX,
+SFX_CALLMODE_SYNCHRON, &aSbxItem, 0L
+);
+return true;
+}
+break;
+
+default:
+break;
+}
+return false;
+}
} // namespace basctl
diff --git a/basctl/source/basicide/bastype2.hxx
b/basctl/source/basicide/bastype2.hxx
index 40c7eca..e703d2e 100644
--- a/basctl/source/basicide/bastype2.hxx
+++ b/basctl/source/basicide/bastype2.hxx
@@ -185,7 +185,9 @@ protected:
virtual voidExpandedHdl() SAL_OVERRIDE;
virtual SvTreeListEntry*CloneEntry( SvTreeListEntry* pSource )
SAL_OVERRIDE;
virtual boolExpandingHdl() SAL_OVERRIDE;
+virtual voidKeyInput( const KeyEvent& rEvt ) SAL_OVERRIDE;
+boolOpenCurrent();
voidImpCreateLibEntries( SvTreeListEntry*
pShellRootEntry, const ScriptDocument& rDocument, LibraryLocation eLocation );
voidImpCreateLibSubEntries( SvTreeListEntry*
pLibRootEntry, const ScriptDocument& rDocument, const OUString& rLibName );
voidImpCreateLibSubEntriesInVBAMode( SvTreeListEntry*
pLibRootEntry, const ScriptDocument& rDocument, const OUString& rLibName );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scripting/source
scripting/source/protocolhandler/scripthandler.cxx | 40 +
1 file changed, 40 insertions(+)
New commits:
commit a00c4c5e2fb9461fef1fbce4d51c8cdf36141b9f
Author: Tsutomu Uchino
Date: Sat May 17 10:16:40 2014 +
Resolves: #i113481# query script invocation from the current frame...
when the controller is not yet attached
(cherry picked from commit 03a410876fbdb5f9e1a7216d9d622557275d4896)
Change-Id: I1da3b3da258445d5187dcc75c4d151d08f9017dc
diff --git a/scripting/source/protocolhandler/scripthandler.cxx
b/scripting/source/protocolhandler/scripthandler.cxx
index 50fa627..d2c6f75 100644
--- a/scripting/source/protocolhandler/scripthandler.cxx
+++ b/scripting/source/protocolhandler/scripthandler.cxx
@@ -158,7 +158,28 @@ void SAL_CALL
ScriptProtocolHandler::dispatchWithNotification(
OSL_ENSURE( xDocumentScripts.is(),
"ScriptProtocolHandler::dispatchWithNotification: can't do the security check!"
);
if ( !xDocumentScripts.is() ||
!xDocumentScripts->getAllowMacroExecution() )
+{
+if ( xListener.is() )
+{
+::com::sun::star::frame::DispatchResultEvent aEvent(
+static_cast< ::cppu::OWeakObject* >( this ),
+
::com::sun::star::frame::DispatchResultState::FAILURE,
+invokeResult );
+try
+{
+xListener->dispatchFinished( aEvent ) ;
+}
+catch(RuntimeException & e)
+{
+OSL_TRACE(
+
"ScriptProtocolHandler::dispatchWithNotification: caught RuntimeException"
+"while dispatchFinished with failture of the
execution %s",
+::rtl::OUStringToOString( e.Message,
+RTL_TEXTENCODING_ASCII_US ).pData->buffer );
+}
+}
return;
+}
}
// Creates a ScriptProvider ( if one is not created already )
@@ -333,6 +354,25 @@ ScriptProtocolHandler::getScriptInvocation()
if ( !m_xScriptInvocation.set( xController->getModel(), UNO_QUERY
) )
m_xScriptInvocation.set( xController, UNO_QUERY );
}
+else
+{
+Reference< XFrame > xFrame( m_xFrame.get(), UNO_QUERY );
+if ( xFrame.is() )
+{
+SfxFrame* pFrame = NULL;
+for ( pFrame = SfxFrame::GetFirst(); pFrame; pFrame =
SfxFrame::GetNext( *pFrame ) )
+{
+if ( pFrame->GetFrameInterface() == xFrame )
+break;
+}
+SfxObjectShell* pDocShell = pFrame ?
pFrame->GetCurrentDocument() : SfxObjectShell::Current();
+if ( pDocShell )
+{
+Reference< XModel > xModel( pDocShell->GetModel() );
+m_xScriptInvocation.set( xModel, UNO_QUERY );
+}
+}
+}
}
return m_xScriptInvocation.is();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source
cui/source/tabpages/page.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 0e65f83415708d5072edd65d75253a721ddbeefa
Author: Tsutomu Uchino
Date: Sat May 17 07:06:55 2014 +
Resolves: #i53447# update example view for Draw...
during the activation of the tab page
(cherry picked from commit cda643a4d4c5a32b3d171aaa888d718409b3d5f3)
Change-Id: I0b0ca24374050675158b16001f0709846e5ee8f9
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index e13fce1..fbc24a7 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -1373,6 +1373,7 @@ void SvxPageDescPage::InitHeadFoot_Impl( const
SfxItemSet& rSet )
void SvxPageDescPage::ActivatePage( const SfxItemSet& rSet )
{
InitHeadFoot_Impl( rSet );
+UpdateExample_Impl();
ResetBackground_Impl( rSet );
RangeHdl_Impl( 0 );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - officecfg/registry
officecfg/registry/schema/org/openoffice/Office/Calc.xcs |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c9e4fd337abdb6460441450a0ea48eef4afa05d9 Author: Tsutomu Uchino Date: Sat May 17 15:29:00 2014 + #i123625# enable Detect Special Number as default in CSV import dialog diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs index ba4129a..463db9c 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs @@ -1043,7 +1043,7 @@ If true, Calc tries to detect special number format, such as date and scientific notation. DetectSpecialNumbers -false +true ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - scripting/source
scripting/source/protocolhandler/scripthandler.cxx | 40 +
1 file changed, 40 insertions(+)
New commits:
commit 03a410876fbdb5f9e1a7216d9d622557275d4896
Author: Tsutomu Uchino
Date: Sat May 17 10:16:40 2014 +
#i113481# query script invocation from the current frame when the
controller is not yet attached
diff --git a/scripting/source/protocolhandler/scripthandler.cxx
b/scripting/source/protocolhandler/scripthandler.cxx
index 85faf4c..12ee326 100644
--- a/scripting/source/protocolhandler/scripthandler.cxx
+++ b/scripting/source/protocolhandler/scripthandler.cxx
@@ -170,7 +170,28 @@ void SAL_CALL
ScriptProtocolHandler::dispatchWithNotification(
OSL_ENSURE( xDocumentScripts.is(),
"ScriptProtocolHandler::dispatchWithNotification: can't do the security check!"
);
if ( !xDocumentScripts.is() ||
!xDocumentScripts->getAllowMacroExecution() )
+{
+if ( xListener.is() )
+{
+::com::sun::star::frame::DispatchResultEvent aEvent(
+static_cast< ::cppu::OWeakObject* >( this ),
+
::com::sun::star::frame::DispatchResultState::FAILURE,
+invokeResult );
+try
+{
+xListener->dispatchFinished( aEvent ) ;
+}
+catch(RuntimeException & e)
+{
+OSL_TRACE(
+
"ScriptProtocolHandler::dispatchWithNotification: caught RuntimeException"
+"while dispatchFinished with failture of the
execution %s",
+::rtl::OUStringToOString( e.Message,
+RTL_TEXTENCODING_ASCII_US ).pData->buffer );
+}
+}
return;
+}
}
// Creates a ScriptProvider ( if one is not created already )
@@ -345,6 +366,25 @@ ScriptProtocolHandler::getScriptInvocation()
if ( !m_xScriptInvocation.set( xController->getModel(), UNO_QUERY
) )
m_xScriptInvocation.set( xController, UNO_QUERY );
}
+else
+{
+Reference< XFrame > xFrame( m_xFrame.get(), UNO_QUERY );
+if ( xFrame.is() )
+{
+SfxFrame* pFrame = NULL;
+for ( pFrame = SfxFrame::GetFirst(); pFrame; pFrame =
SfxFrame::GetNext( *pFrame ) )
+{
+if ( pFrame->GetFrameInterface() == xFrame )
+break;
+}
+SfxObjectShell* pDocShell = pFrame ?
pFrame->GetCurrentDocument() : SfxObjectShell::Current();
+if ( pDocShell )
+{
+Reference< XModel > xModel( pDocShell->GetModel() );
+m_xScriptInvocation.set( xModel, UNO_QUERY );
+}
+}
+}
}
return m_xScriptInvocation.is();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - basctl/source
basctl/source/basicide/objdlg.cxx | 41 +-
basctl/source/basicide/objdlg.hxx |2 +
2 files changed, 30 insertions(+), 13 deletions(-)
New commits:
commit 7bc75c1a7b05d81631ebccf05bf022636d1a3a14
Author: Tsutomu Uchino
Date: Sat May 17 09:39:39 2014 +
#i76558# jump by Enter key on the Object catalog
diff --git a/basctl/source/basicide/objdlg.cxx
b/basctl/source/basicide/objdlg.cxx
index b9c85ee..a2431a6 100644
--- a/basctl/source/basicide/objdlg.cxx
+++ b/basctl/source/basicide/objdlg.cxx
@@ -66,26 +66,41 @@ void ObjectTreeListBox::MouseButtonDown( const MouseEvent&
rMEvt )
if ( rMEvt.IsLeft() && ( rMEvt.GetClicks() == 2 ) )
{
-BasicEntryDescriptor aDesc( GetEntryDescriptor( GetCurEntry() ) );
+OpenCurrent();
+}
+}
+
+void ObjectTreeListBox::KeyInput( const KeyEvent& rEvt )
+{
+if ( rEvt.GetKeyCode() == KEY_RETURN && OpenCurrent() )
+{
+return;
+}
+BasicTreeListBox::KeyInput( rEvt );
+}
+
+bool ObjectTreeListBox::OpenCurrent()
+{
+BasicEntryDescriptor aDesc( GetEntryDescriptor( GetCurEntry() ) );
-if ( aDesc.GetType() == OBJ_TYPE_METHOD )
+if ( aDesc.GetType() == OBJ_TYPE_METHOD )
+{
+BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
+SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() :
NULL;
+SfxDispatcher* pDispatcher = pViewFrame ? pViewFrame->GetDispatcher()
: NULL;
+if( pDispatcher )
{
-BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
-SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() :
NULL;
-SfxDispatcher* pDispatcher = pViewFrame ?
pViewFrame->GetDispatcher() : NULL;
-if( pDispatcher )
-{
-SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, aDesc.GetDocument(),
aDesc.GetLibName(), aDesc.GetName(),
- aDesc.GetMethodName(), ConvertType(
aDesc.GetType() ) );
-pDispatcher->Execute( SID_BASICIDE_SHOWSBX,
-SFX_CALLMODE_SYNCHRON, &aSbxItem, 0L );
-}
+SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, aDesc.GetDocument(),
aDesc.GetLibName(), aDesc.GetName(),
+ aDesc.GetMethodName(), ConvertType(
aDesc.GetType() ) );
+pDispatcher->Execute( SID_BASICIDE_SHOWSBX,
+SFX_CALLMODE_SYNCHRON, &aSbxItem, 0L );
+return true;
}
}
+return false;
}
-
ObjectCatalog::ObjectCatalog( Window * pParent )
:FloatingWindow( pParent, IDEResId( RID_BASICIDE_OBJCAT ) )
,aMacroTreeList( this, IDEResId( RID_TLB_MACROS ) )
diff --git a/basctl/source/basicide/objdlg.hxx
b/basctl/source/basicide/objdlg.hxx
index feda773..273b323 100644
--- a/basctl/source/basicide/objdlg.hxx
+++ b/basctl/source/basicide/objdlg.hxx
@@ -40,7 +40,9 @@ private:
virtual voidCommand( const CommandEvent& rCEvt );
virtual voidMouseButtonDown( const MouseEvent& rMEvt );
+virtual voidKeyInput( const KeyEvent& rEvt );
+boolOpenCurrent();
public:
ObjectTreeListBox( Window* pParent, const ResId& rRes );
~ObjectTreeListBox();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - cui/source
cui/source/tabpages/page.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit cda643a4d4c5a32b3d171aaa888d718409b3d5f3
Author: Tsutomu Uchino
Date: Sat May 17 07:06:55 2014 +
#i53447# update example view for Draw during the activation of the tab page
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index c5c3495..3edba4b 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -1458,6 +1458,7 @@ void SvxPageDescPage::InitHeadFoot_Impl( const
SfxItemSet& rSet )
void SvxPageDescPage::ActivatePage( const SfxItemSet& rSet )
{
InitHeadFoot_Impl( rSet );
+UpdateExample_Impl();
ResetBackground_Impl( rSet );
RangeHdl_Impl( 0 );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: toolkit/source
toolkit/source/awt/vclxwindows.cxx |6 ++
1 file changed, 6 insertions(+)
New commits:
commit 5350520ec8da250f57dde664e95229c0e4d5a2ab
Author: Tsutomu Uchino
Date: Fri May 16 08:25:28 2014 +
Resolves: #i98216# extract boolean value for AutoFill value of ComboBox
model
(cherry picked from commit 213aafbf006a5099e951f65a472e4f8fa66256a4)
Change-Id: I862abc31b69b98f0ec766ca260fdc063d14a2ee4
diff --git a/toolkit/source/awt/vclxwindows.cxx
b/toolkit/source/awt/vclxwindows.cxx
index 78637d4..62ec589 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -4366,6 +4366,12 @@ void VCLXComboBox::setProperty( const OUString&
PropertyName, const ::com::sun::
sal_Int16 n = sal_Int16();
if ( Value >>= n )
pComboBox->EnableAutocomplete( n != 0 );
+else
+{
+sal_Bool b = sal_Bool();
+if ( Value >>= b )
+pComboBox->EnableAutocomplete( b );
+}
}
break;
case BASEPROPERTY_STRINGITEMLIST:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - toolkit/source
toolkit/source/awt/vclxwindows.cxx |6 ++
1 file changed, 6 insertions(+)
New commits:
commit 213aafbf006a5099e951f65a472e4f8fa66256a4
Author: Tsutomu Uchino
Date: Fri May 16 08:25:28 2014 +
#i98216# extract boolean value for AutoFill value of ComboBox model
diff --git a/toolkit/source/awt/vclxwindows.cxx
b/toolkit/source/awt/vclxwindows.cxx
index 26a132b..05311f3 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -4074,6 +4074,12 @@ void VCLXComboBox::setProperty( const ::rtl::OUString&
PropertyName, const ::com
sal_Int16 n = sal_Int16();
if ( Value >>= n )
pComboBox->EnableAutocomplete( n != 0 );
+ else
+ {
+sal_Bool b = sal_Bool();
+if ( Value >>= b )
+pComboBox->EnableAutocomplete( b );
+}
}
break;
case BASEPROPERTY_STRINGITEMLIST:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/uibase/utlui/navipi.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 3915e0034d6d0f96dcb37af51dad5eab490eef8c Author: Tsutomu Uchino Date: Thu May 8 08:08:57 2014 + Resolves: #i27364# set line count of dropdown to 9... for document list of navigator on Writer (cherry picked from commit c104272ea1274dea87cd66cfaa61b34806708521) Change-Id: Iac9644d513dd1195b3986d79607f336dc6ed9884 diff --git a/sw/source/core/uibase/utlui/navipi.cxx b/sw/source/core/uibase/utlui/navipi.cxx index 1eec0af..f4e7830 100644 --- a/sw/source/core/uibase/utlui/navipi.cxx +++ b/sw/source/core/uibase/utlui/navipi.cxx @@ -692,6 +692,7 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings, aContentToolBox.SetHelpId(HID_NAVIGATOR_TOOLBOX ); aGlobalToolBox.SetHelpId(HID_NAVIGATOR_GLOBAL_TOOLBOX); aDocListBox.SetHelpId(HID_NAVIGATOR_LISTBOX ); +aDocListBox.SetDropDownLineCount(9); nDocLBIniHeight = aDocListBox.GetSizePixel().Height(); nZoomOutInit = nZoomOut = Resource::ReadShortRes(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - sw/source
sw/source/core/unocore/unoportenum.cxx |2 +-
sw/source/ui/ribbar/workctrl.cxx |4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 9098e3da831f24cd384f5bc70c42310792bb3bde
Author: Tsutomu Uchino
Date: Tue Feb 11 11:58:13 2014 +
#i56998# add space separator on the preview zoom control of the preview
toolbar
diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/ui/ribbar/workctrl.cxx
index 31c8ed1..f294840 100644
--- a/sw/source/ui/ribbar/workctrl.cxx
+++ b/sw/source/ui/ribbar/workctrl.cxx
@@ -799,7 +799,7 @@ SwZoomBox_Impl::SwZoomBox_Impl(
for(sal_uInt16 i = 0; i < sizeof(aZoomValues)/sizeof(sal_uInt16); i++)
{
String sEntry = String::CreateFromInt32(aZoomValues[i]);
-sEntry += '%';
+sEntry.AppendAscii( " %" );
InsertEntry(sEntry);
}
}
@@ -931,7 +931,7 @@ void SwPreviewZoomControl::StateChanged( sal_uInt16
/*nSID*/,
if(SFX_ITEM_AVAILABLE <= eState)
{
String sZoom(String::CreateFromInt32(((const
SfxUInt16Item*)pState)->GetValue()));
-sZoom += '%';
+sZoom.AppendAscii( " %" );
pBox->SetText(sZoom);
pBox->SaveValue();
}
commit b95fa33a4d2827adb8e16de5bae4e535d8c826c9
Author: Oliver-Rainer Wittmann
Date: Tue Feb 11 10:15:45 2014 +
124178: correct export of User Variable Input Fields
diff --git a/sw/source/core/unocore/unoportenum.cxx
b/sw/source/core/unocore/unoportenum.cxx
index c912aeb..7fbfe7b 100644
--- a/sw/source/core/unocore/unoportenum.cxx
+++ b/sw/source/core/unocore/unoportenum.cxx
@@ -892,7 +892,7 @@ lcl_ExportHints(
{
pUnoCrsr->Right(
-pAttr->GetFmtFld().GetField()->GetPar1().Len() + 2,
+pAttr->GetFmtFld().GetField()->ExpandField( true
).Len() + 2,
CRSR_SKIP_CHARS,
sal_False,
sal_False );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sc/source
sc/source/ui/miscdlgs/inscodlg.cxx |6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) New commits: commit 6abcfea44da2811940578f248080951eb320420f Author: Tsutomu Uchino Date: Thu Jan 23 11:28:01 2014 + #i123626# change default for paste special dialog of Calc to Text, Numbers and Date and time diff --git a/sc/source/ui/miscdlgs/inscodlg.cxx b/sc/source/ui/miscdlgs/inscodlg.cxx index d28aac3..32c33d0 100644 --- a/sc/source/ui/miscdlgs/inscodlg.cxx +++ b/sc/source/ui/miscdlgs/inscodlg.cxx @@ -37,10 +37,8 @@ //== -sal_Bool ScInsertContentsDlg::bPreviousAllCheck = sal_True; -sal_uInt16 ScInsertContentsDlg::nPreviousChecks = (IDF_DATETIME | IDF_STRING | - IDF_NOTE | IDF_FORMULA | - IDF_ATTRIB | IDF_OBJECTS); +sal_Bool ScInsertContentsDlg::bPreviousAllCheck = sal_False; +sal_uInt16 ScInsertContentsDlg::nPreviousChecks = (IDF_VALUE | IDF_DATETIME | IDF_STRING); sal_uInt16 ScInsertContentsDlg::nPreviousFormulaChecks = PASTE_NOFUNC; sal_uInt16 ScInsertContentsDlg::nPreviousChecks2 = 0; sal_uInt16 ScInsertContentsDlg::nPreviousMoveMode = INS_NONE; // enum InsCellCmd ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basctl/sdi basctl/source
basctl/sdi/baside.sdi |1 +
basctl/source/basicide/baside2.cxx | 13 -
basctl/source/basicide/baside3.cxx |5 +
3 files changed, 18 insertions(+), 1 deletion(-)
New commits:
commit 4f03eb00fcb6b1c3a06709edab56c8e2508241d5
Author: Tsutomu Uchino
Date: Wed Jan 22 07:41:16 2014 +
Related: #i50481# improve Select All command in Basic IDE
see also fdo#37211 i.e. commit 4bc2724240b11ce4dfb7adafbe1f1c260fa44030
(cherry picked from commit f841659faf09fec69c962959b9da032fa0bc2b16)
Conflicts:
basctl/source/basicide/baside2.cxx
basctl/source/basicide/baside2b.cxx
basctl/source/basicide/baside3.cxx
Change-Id: Id679b1e16b87ec8d81fb78039318728320b9d5bc
diff --git a/basctl/sdi/baside.sdi b/basctl/sdi/baside.sdi
index 271441c..586b328 100644
--- a/basctl/sdi/baside.sdi
+++ b/basctl/sdi/baside.sdi
@@ -57,6 +57,7 @@ shell basctl_Shell
SID_SELECTALL
[
ExecMethod = ExecuteCurrent;
+StateMethod = GetState;
]
SID_CUT
diff --git a/basctl/source/basicide/baside2.cxx
b/basctl/source/basicide/baside2.cxx
index 2f8744e..c9719ff 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -952,8 +952,13 @@ void ModulWindow::ExecuteCommand (SfxRequest& rReq)
break;
}
case SID_SELECTALL:
-GetEditView()->SetSelection( TextSelection( TextPaM( 0, 0 ),
TextPaM( 0x, 0x ) ) );
+{
+TextSelection aSel( TextPaM( 0, 0 ), TextPaM( TEXT_PARA_ALL,
0x ) );
+TextView * pView = GetEditView();
+pView->SetSelection( aSel );
+pView->GetWindow()->GrabFocus();
break;
+}
case SID_BASICRUN:
{
BasicRun();
@@ -1170,6 +1175,12 @@ void ModulWindow::GetState( SfxItemSet &rSet )
rSet.Put(SfxBoolItem(nWh, bSourceLinesEnabled));
break;
}
+case SID_SELECTALL:
+{
+if ( !GetEditView() )
+rSet.DisableItem( nWh );
+}
+break;
}
}
}
diff --git a/basctl/source/basicide/baside3.cxx
b/basctl/source/basicide/baside3.cxx
index a7b0b20..14ef27f 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -409,6 +409,11 @@ void DialogWindow::GetState( SfxItemSet& rSet )
rSet.Put(SfxVisibilityItem(nWh, false));
break;
}
+case SID_SELECTALL:
+{
+rSet.DisableItem( nWh );
+}
+break;
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/dibtools.cxx | 12
1 file changed, 12 deletions(-)
New commits:
commit b65991145a07287f93b9738f4b9ab3ceca36402d
Author: Tsutomu Uchino
Date: Wed Jan 22 06:16:21 2014 +
Resolves: #i106063# avoid additional seek for true color DIB
The position in the stream is already at the end of color palette.
(cherry picked from commit 352ca2f6ecf8910afa24c53d7e872f62b2321321)
Change-Id: I1696c1b6780407ab579b6215ab13a327ae09fc32
diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index 79bc942..389f17e 100644
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -414,12 +414,6 @@ bool ImplReadDIBBits(SvStream& rIStm, DIBV5Header&
rHeader, BitmapWriteAccess& r
// Read data
if(bNative)
{
-// true color DIB's can have a (optimization) palette
-if(rHeader.nColsUsed && 8 < rHeader.nBitCount)
-{
-rIStm.SeekRel(rHeader.nColsUsed * ((rHeader.nSize !=
DIBCOREHEADERSIZE ) ? 4 : 3));
-}
-
rIStm.Read(rAcc.GetBuffer(), rHeader.nHeight * nAlignedWidth);
}
else
@@ -455,12 +449,6 @@ bool ImplReadDIBBits(SvStream& rIStm, DIBV5Header&
rHeader, BitmapWriteAccess& r
const long nHeight(rHeader.nHeight);
sal_uInt8* pBuf = new sal_uInt8[nAlignedWidth];
-// true color DIB's can have a (optimization) palette
-if(rHeader.nColsUsed && 8 < rHeader.nBitCount)
-{
-rIStm.SeekRel(rHeader.nColsUsed * ((rHeader.nSize !=
DIBCOREHEADERSIZE ) ? 4 : 3));
-}
-
const long nI(bTopDown ? 1 : -1);
long nY(bTopDown ? 0 : nHeight - 1);
long nCount(nHeight);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - basctl/sdi basctl/source vcl/source
basctl/sdi/baside.sdi |6 ++
basctl/source/basicide/baside2.cxx | 14 ++
basctl/source/basicide/baside2b.cxx |4 +---
basctl/source/basicide/baside3.cxx |6 ++
vcl/source/gdi/dibtools.cxx | 12
5 files changed, 27 insertions(+), 15 deletions(-)
New commits:
commit f841659faf09fec69c962959b9da032fa0bc2b16
Author: Tsutomu Uchino
Date: Wed Jan 22 07:41:16 2014 +
#i50481# make Select All command working through the main menu of Basic IDE
diff --git a/basctl/sdi/baside.sdi b/basctl/sdi/baside.sdi
index 8165229..7e4012f 100644
--- a/basctl/sdi/baside.sdi
+++ b/basctl/sdi/baside.sdi
@@ -101,6 +101,12 @@ shell BasicIDEShell
StateMethod = GetState;
]
+SID_SELECTALL
+[
+ExecMethod = ExecuteCurrent;
+StateMethod = GetState;
+]
+
SID_SEARCH_ITEM
[
ExecMethod = ExecuteCurrent;
diff --git a/basctl/source/basicide/baside2.cxx
b/basctl/source/basicide/baside2.cxx
index f370d3c..b417c54 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -1132,6 +1132,14 @@ void __EXPORT ModulWindow::ExecuteCommand( SfxRequest&
rReq )
GetBreakPointWindow().Invalidate();
}
break;
+case SID_SELECTALL:
+{
+TextSelection aSel( TextPaM( 0, 0 ), TextPaM( TEXT_PARA_ALL,
0x ) );
+TextView * pView = GetEditView();
+pView->SetSelection( aSel );
+pView->GetWindow()->GrabFocus();
+}
+break;
}
}
@@ -1198,6 +1206,12 @@ void __EXPORT ModulWindow::GetState( SfxItemSet &rSet )
}
}
break;
+case SID_SELECTALL:
+{
+if ( !GetEditView() )
+rSet.DisableItem( nWh );
+}
+break;
}
}
}
diff --git a/basctl/source/basicide/baside2b.cxx
b/basctl/source/basicide/baside2b.cxx
index a7f7e97..cb6ef05 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -431,9 +431,7 @@ void __EXPORT EditorWindow::KeyInput( const KeyEvent& rKEvt
)
sal_Bool bWasModified = pEditEngine->IsModified();
if ( !TextEngine::DoesKeyChangeText( rKEvt ) || ImpCanModify() )
{
-if ( ( rKEvt.GetKeyCode().GetCode() == KEY_A) &&
rKEvt.GetKeyCode().IsMod1() )
-pEditView->SetSelection( TextSelection( TextPaM( 0, 0 ), TextPaM(
0x, 0x ) ) );
-else if ( ( rKEvt.GetKeyCode().GetCode() == KEY_Y ) &&
rKEvt.GetKeyCode().IsMod1() )
+if ( ( rKEvt.GetKeyCode().GetCode() == KEY_Y ) &&
rKEvt.GetKeyCode().IsMod1() )
bDone = sal_True; // CTRL-Y schlucken, damit kein Vorlagenkatalog
else
{
diff --git a/basctl/source/basicide/baside3.cxx
b/basctl/source/basicide/baside3.cxx
index 84ece10..4c5cb19 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -431,6 +431,12 @@ void __EXPORT DialogWindow::GetState( SfxItemSet& rSet )
rSet.DisableItem( nWh );
}
break;
+
+case SID_SELECTALL:
+{
+rSet.DisableItem( nWh );
+}
+break;
}
}
}
commit 352ca2f6ecf8910afa24c53d7e872f62b2321321
Author: Tsutomu Uchino
Date: Wed Jan 22 06:16:21 2014 +
#i106063# avoid additional seek for true color DIB
The position in the stream is already at the end of color palette.
diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index bdfce54..2e7d698 100755
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -419,12 +419,6 @@ bool ImplReadDIBBits(SvStream& rIStm, DIBV5Header&
rHeader, BitmapWriteAccess& r
// Read data
if(bNative)
{
-// true color DIB's can have a (optimization) palette
-if(rHeader.nColsUsed && 8 < rHeader.nBitCount)
-{
-rIStm.SeekRel(rHeader.nColsUsed * ((rHeader.nSize !=
DIBCOREHEADERSIZE ) ? 4 : 3));
-}
-
rIStm.Read(rAcc.GetBuffer(), rHeader.nHeight * nAlignedWidth);
}
else
@@ -460,12 +454,6 @@ bool ImplReadDIBBits(SvStream& rIStm, DIBV5Header&
rHeader, BitmapWriteAccess& r
const long nHeight(rHeader.nHeight);
sal_uInt8* pBuf = new sal_uInt8[nAlignedWidth];
-// true color DIB's can have a (optimization) palette
-if(rHeader.nColsUsed && 8 < rHeader.nBitCount)
-{
-rIStm.SeekRel(rHeader.nColsUsed * ((rHeader.nSize !=
DIBCOREHEADERSIZE ) ? 4 : 3));
-}
-
const long nI(bTopDown ? 1 : -1);
long nY(bTopDown ? 0 : nHeight - 1);
long nCount(nHeight);
___
Libreoffice-commits m
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 4 commits - basegfx/inc extras/source framework/inc sw/source ucb/source uui/source
basegfx/inc/basegfx/tools/b2dclipstate.hxx |2
extras/source/autotext/lang/en-US/acor_en-US.dat |binary
framework/inc/uielement/genericstatusbarcontroller.hxx |2
sw/source/core/access/accpara.hxx |2
ucb/source/ucp/webdav/SerfSession.cxx | 44 +++--
ucb/source/ucp/webdav/SerfTypes.hxx|2
ucb/source/ucp/webdav/SerfUri.hxx |2
uui/source/iahndl-ssl.cxx |5 +
8 files changed, 48 insertions(+), 11 deletions(-)
New commits:
commit 17e2f9c3d2eb0d3b7f559055327d37171db01c2f
Author: Tsutomu Uchino
Date: Tue Jan 21 16:36:08 2014 +
#i124067# remove naive entry from auto correct list for en-US
diff --git a/extras/source/autotext/lang/en-US/acor_en-US.dat
b/extras/source/autotext/lang/en-US/acor_en-US.dat
index d4e9a3d..681f362 100644
Binary files a/extras/source/autotext/lang/en-US/acor_en-US.dat and
b/extras/source/autotext/lang/en-US/acor_en-US.dat differ
commit 226085ad2004319c5142b392bb4b48ab79c3b747
Author: Oliver-Rainer Wittmann
Date: Tue Jan 21 16:32:58 2014 +
123744: method - consider
certificate's Subject Alternative Name field when searching for matching
certificate host name
diff --git a/ucb/source/ucp/webdav/SerfSession.cxx
b/ucb/source/ucp/webdav/SerfSession.cxx
index dc08678..a5354eb 100644
--- a/ucb/source/ucp/webdav/SerfSession.cxx
+++ b/ucb/source/ucp/webdav/SerfSession.cxx
@@ -30,7 +30,7 @@
#include "ucbhelper/simplecertificatevalidationrequest.hxx"
#include "AprEnv.hxx"
-#include
+#include
#include "DAVAuthListener.hxx"
#include "SerfTypes.hxx"
@@ -47,6 +47,10 @@
#include
#include
#include
+#include
+#include
+#define OID_SUBJECT_ALTERNATIVE_NAME "2.5.29.17"
+
#include
#include
@@ -479,7 +483,40 @@ apr_status_t SerfSession::verifySerfCertificateChain (
// When the certificate matches the host name then we can use the
// result of the verification.
-if (isDomainMatch(sServerCertificateSubject))
+bool bHostnameMatchesCertHostnames = false;
+{
+uno::Sequence< uno::Reference< security::XCertificateExtension > >
extensions = xServerCertificate->getExtensions();
+uno::Sequence< security::CertAltNameEntry > altNames;
+for (sal_Int32 i = 0 ; i < extensions.getLength(); ++i)
+{
+uno::Reference< security::XCertificateExtension >element =
extensions[i];
+
+const rtl::OString aId ( (const sal_Char
*)element->getExtensionId().getArray(), element->getExtensionId().getLength());
+if ( aId.equals( OID_SUBJECT_ALTERNATIVE_NAME ) )
+{
+uno::Reference< security::XSanExtension > sanExtension (
element, uno::UNO_QUERY );
+altNames = sanExtension->getAlternativeNames();
+break;
+}
+}
+
+uno::Sequence< ::rtl::OUString > certHostNames(altNames.getLength() +
1);
+certHostNames[0] = sServerCertificateSubject;
+for( int n = 0; n < altNames.getLength(); ++n )
+{
+if (altNames[n].Type == security::ExtAltNameType_DNS_NAME)
+{
+altNames[n].Value >>= certHostNames[n+1];
+}
+}
+
+for ( int i = 0; i < certHostNames.getLength() &&
!bHostnameMatchesCertHostnames; ++i )
+{
+bHostnameMatchesCertHostnames = isDomainMatch( certHostNames[i] );
+}
+
+}
+if ( bHostnameMatchesCertHostnames )
{
if (nVerificationResult == 0)
@@ -526,8 +563,7 @@ apr_status_t SerfSession::verifySerfCertificateChain (
if ( xSelection.is() )
{
-uno::Reference< task::XInteractionApprove > xApprove(
-xSelection.get(), uno::UNO_QUERY );
+uno::Reference< task::XInteractionApprove > xApprove(
xSelection.get(), uno::UNO_QUERY );
if ( xApprove.is() )
{
xCertificateContainer->addCertificate( getHostName(),
sServerCertificateSubject, sal_True );
diff --git a/ucb/source/ucp/webdav/SerfTypes.hxx
b/ucb/source/ucp/webdav/SerfTypes.hxx
index d525d6b..23d8bee 100644
--- a/ucb/source/ucp/webdav/SerfTypes.hxx
+++ b/ucb/source/ucp/webdav/SerfTypes.hxx
@@ -24,7 +24,7 @@
#ifndef INCLUDED_SERFTYPES_HXX
#define INCLUDED_SERFTYPES_HXX
-#include
+#include
typedef serf_connection_t SerfConnection;
diff --git a/ucb/source/ucp/webdav/SerfUri.hxx
b/ucb/source/ucp/webdav/SerfUri.hxx
index d6844a1..8bd45de 100644
--- a/ucb/source/ucp/webdav/SerfUri.hxx
+++ b/ucb/source/ucp/webdav/SerfUri.hxx
@@ -23,7 +23,7 @@
#ifndef INCLUDED_SERFURI_HXX
#define INCLUDED_SERFURI_HXX
-#include
+#include
#include
#include "DAVException.hxx"
commit 117218
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - starmath/source
starmath/source/document.cxx |1 + starmath/source/unomodel.cxx |1 + 2 files changed, 2 insertions(+) New commits: commit 5c6ef989906c6aa51b2e3702bac0323ef97e9f2d Author: Tsutomu Uchino Date: Mon Jan 20 13:22:16 2014 + #i121289# printer options should contain SID_SAVE_ONLY_USED_SYMBOLS value diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx index bfd8768..0991185 100644 --- a/starmath/source/document.cxx +++ b/starmath/source/document.cxx @@ -622,6 +622,7 @@ Printer* SmDocShell::GetPrt() SID_PRINTTEXT, SID_PRINTTEXT, SID_PRINTFRAME, SID_PRINTFRAME, SID_NO_RIGHT_SPACES, SID_NO_RIGHT_SPACES, + SID_SAVE_ONLY_USED_SYMBOLS, SID_SAVE_ONLY_USED_SYMBOLS, 0); SmModule *pp = SM_MOD(); diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx index bff1854..7a0b154 100644 --- a/starmath/source/unomodel.cxx +++ b/starmath/source/unomodel.cxx @@ -699,6 +699,7 @@ void SmModel::_setPropertyValues(const PropertyMapEntry** ppEntries, const Any* SID_PRINTTEXT, SID_PRINTTEXT, SID_PRINTFRAME, SID_PRINTFRAME, SID_NO_RIGHT_SPACES, SID_NO_RIGHT_SPACES, +SID_SAVE_ONLY_USED_SYMBOLS, SID_SAVE_ONLY_USED_SYMBOLS, 0 }; SfxItemSet *pItemSet = new SfxItemSet( pDocSh->GetPool(), nRange ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/control/field.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit aab6645595dc4210cc61a97aa9c137ecea5adace
Author: Tsutomu Uchino
Date: Sat Jan 18 09:52:44 2014 +
Related: #i56998# percent value should not takes space separator...
before the character
(cherry picked from commit acac627b8aed3353e542ce41fa9a7064e4d1790b)
Conflicts:
vcl/source/control/field.cxx
Change-Id: Ia9c5496e1e2345f6249dc03efaf2c60f4231aecd
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 8df9c0e..9a0e569 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -1429,7 +1429,7 @@ OUString MetricFormatter::CreateFieldText( sal_Int64
nValue ) const
aStr += maCustomUnitText;
else
{
-if (meUnit != FUNIT_NONE || meUnit != FUNIT_PERCENT || meUnit !=
FUNIT_DEGREE)
+if (meUnit != FUNIT_NONE && meUnit != FUNIT_PERCENT && meUnit !=
FUNIT_DEGREE)
aStr += " ";
aStr += ImplMetricToString( meUnit );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - sd/source sw/source
sd/source/ui/slidesorter/controller/SlsListener.cxx |5 -
sw/source/core/text/inftxt.hxx |1 -
sw/source/core/text/portxt.cxx | 10 ++
3 files changed, 10 insertions(+), 6 deletions(-)
New commits:
commit eacf6ec741dcc66f07e0b7b2a3a402d2f3c670fa
Author: Tsutomu Uchino
Date: Mon Jan 20 12:03:42 2014 +
#i11# fix slide selected in Slide Pane with Page Up
The comment in the removed part says to call SelectPage to make
the slide visible. But the following NotifyCurrentSlideChange method
calls SelectPage for the page makes it visible if the pane is not updated
yet.
diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx
b/sd/source/ui/slidesorter/controller/SlsListener.cxx
index 64965d4..dfe9ccf 100644
--- a/sd/source/ui/slidesorter/controller/SlsListener.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx
@@ -501,11 +501,6 @@ void SAL_CALL Listener::propertyChange (
String(RTL_CONSTASCII_USTRINGPARAM("Number")));
sal_Int32 nCurrentPage = 0;
aPageNumber >>= nCurrentPage;
-// The selection is already set but we call SelectPage()
-// nevertheless in order to make the new current page the
-// last recently selected page of the PageSelector. This is
-// used when making the selection visible.
-mrController.GetPageSelector().SelectPage(nCurrentPage-1);
mrController.GetCurrentSlideManager()->NotifyCurrentSlideChange(nCurrentPage-1);
}
catch (beans::UnknownPropertyException aEvent)
commit 14e0270c3ebad9a1fb817fcfced2aa8ee2f3e3f0
Author: Oliver-Rainer Wittmann
Date: Mon Jan 20 10:57:12 2014 +
124039: - assure correct line break for
multi-lined Input Fields
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index 3594f3d..11f3a21 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -608,7 +608,6 @@ public:
inline void Right( const SwTwips nNew ) { nRight = nNew; }
inline SwTwips First() const { return nFirst; }
inline void First( const SwTwips nNew ) { nFirst = nNew; }
-inline SwTwips CurrLeft() const { return (nLineStart ? nLeft : nFirst); }
inline KSHORT RealWidth() const { return nRealWidth; }
inline void RealWidth( const KSHORT nNew ) { nRealWidth = nNew; }
inline KSHORT ForcedLeftMargin() const { return nForcedLeftMargin; }
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx
index 487ebf3..f881fe3 100644
--- a/sw/source/core/text/portxt.cxx
+++ b/sw/source/core/text/portxt.cxx
@@ -747,6 +747,12 @@ sal_Bool SwTxtInputFldPortion::Format( SwTxtFormatInfo
&rInf )
}
else
{
+const xub_StrLen nFormerLineStart = rInf.GetLineStart();
+if ( !mbContainsInputFieldStart )
+{
+rInf.SetLineStart( 0 );
+}
+
bRet = SwTxtPortion::Format( rInf );
if ( mbContainsInputFieldEnd )
@@ -763,6 +769,10 @@ sal_Bool SwTxtInputFldPortion::Format( SwTxtFormatInfo
&rInf )
// adjust portion length accordingly
SetLen( GetLen() + 1 );
}
+else
+{
+rInf.SetLineStart( nFormerLineStart );
+}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source starmath/source svx/source
cui/source/dialogs/colorpicker.src | 18 +--- cui/source/dialogs/grfflt.src |6 + cui/source/tabpages/tplnedef.cxx |9 +++- starmath/source/dialog.cxx |3 -- starmath/source/smres.src |6 ++--- svx/source/dialog/bmpmask.src | 12 +++--- svx/source/dialog/contdlg.src |3 -- svx/source/dialog/fontwork.cxx |2 - svx/source/dialog/fontwork.src |1 svx/source/engine3d/float3d.src|9 ++-- svx/source/sidebar/area/AreaPropertyPanel.src | 23 - svx/source/sidebar/paragraph/ParaPropertyPanel.src |3 -- 12 files changed, 35 insertions(+), 60 deletions(-) New commits: commit 260df50ae67e0d9f9d80e0686e6a12903c53c130 Author: Tsutomu Uchino Date: Sun Jan 19 13:40:29 2014 + Related: #i56998# use FUNIT_PERCENT instead of FUNIT_CUSTOM... with percent CustomUnitText on metric fields (cherry picked from commit 4f5b26a97dbaef964af1fe323f24109b987cb952) Conflicts: chart2/source/controller/dialogs/tp_3D_SceneGeometry.src chart2/source/controller/dialogs/tp_SeriesToAxis.src cui/source/dialogs/zoom.src cui/source/options/optgdlg.src cui/source/tabpages/autocdlg.src cui/source/tabpages/backgrnd.src cui/source/tabpages/chardlg.src cui/source/tabpages/grfpage.src cui/source/tabpages/numpages.src cui/source/tabpages/paragrph.src cui/source/tabpages/tabarea.src cui/source/tabpages/tabline.src cui/source/tabpages/tparea.cxx cui/source/tabpages/tplnedef.cxx sc/source/ui/pagedlg/pagedlg.src sd/source/ui/animations/CustomAnimationDialog.src starmath/source/dialog.cxx starmath/source/smres.src svx/source/dialog/fontwork.cxx svx/source/sidebar/area/AreaPropertyPanel.src svx/source/sidebar/graphic/GraphicPropertyPanel.src svx/source/sidebar/line/LinePropertyPanel.src svx/source/tbxctrls/fontworkgallery.src sw/source/ui/frmdlg/column.src sw/source/ui/misc/pgfnote.src Change-Id: I8acc5f7fc80d4366750ad38fabbf49b02f013f7c diff --git a/cui/source/dialogs/colorpicker.src b/cui/source/dialogs/colorpicker.src index 7f9c6af..63ab634 100644 --- a/cui/source/dialogs/colorpicker.src +++ b/cui/source/dialogs/colorpicker.src @@ -321,8 +321,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER Spin = TRUE ; Maximum = 100 ; Last = 100 ; -Unit = FUNIT_CUSTOM ; -CustomUnitText = "%" ; +Unit = FUNIT_PERCENT ; }; FixedText CT_BRIGHTNESS @@ -343,8 +342,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER Spin = TRUE ; Maximum = 100 ; Last = 100 ; -Unit = FUNIT_CUSTOM ; -CustomUnitText = "%" ; +Unit = FUNIT_PERCENT ; }; // - @@ -376,8 +374,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER Spin = TRUE ; Maximum = 100 ; Last = 100 ; -Unit = FUNIT_CUSTOM ; -CustomUnitText = "%" ; +Unit = FUNIT_PERCENT ; }; FixedText CT_MAGENTA @@ -398,8 +395,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER Spin = TRUE ; Maximum = 100 ; Last = 100 ; -Unit = FUNIT_CUSTOM ; -CustomUnitText = "%" ; +Unit = FUNIT_PERCENT ; }; FixedText CT_YELLOW @@ -420,8 +416,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER Spin = TRUE ; Maximum = 100 ; Last = 100 ; -Unit = FUNIT_CUSTOM ; -CustomUnitText = "%" ; +Unit = FUNIT_PERCENT ; }; FixedText CT_KEY @@ -442,8 +437,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER Spin = TRUE ; Maximum = 100 ; Last = 100 ; -Unit = FUNIT_CUSTOM ; -CustomUnitText = "%" ; +Unit = FUNIT_PERCENT ; }; // -- diff --git a/cui/source/dialogs/grfflt.src b/cui/source/dialogs/grfflt.src index 73b1094..ff1cfb2 100644 --- a/cui/source/dialogs/grfflt.src +++ b/cui/source/dialogs/grfflt.src @@ -174,8 +174,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SOLARIZE Spin = TRUE ; Maximum = 100 ; StrictFormat = TRUE ; -Unit = FUNIT_CUSTOM ; -CustomUnitText = "%" ; +Unit = FUNIT_PERCENT ; Last = 100 ; SpinSize = 1 ; }; @@ -255,8 +254,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SEPIA Minimum = 1 ; Maximum = 100 ; StrictFormat = TRUE ; -Unit = FUNIT_CUSTOM ; -CustomUnitText = "%" ; +Unit = FUNIT_PERCENT ;
[Libreoffice-commits] core.git: svtools/source svx/source
svtools/source/control/ctrlbox.cxx |3 +--
svx/source/dialog/relfld.cxx |3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
New commits:
commit 66ff6924d50fc77e7a3e80c74a12a088a874df8b
Author: Tsutomu Uchino
Date: Sun Jan 19 14:16:45 2014 +
Related: #i56998# use FUNIT_PERCENT on fields that allow relative value
(cherry picked from commit fc6fc5b576b972a8ea0551091cc57aa1cfe1334d)
Conflicts:
svtools/source/control/ctrlbox.cxx
svx/source/dialog/relfld.cxx
Change-Id: Ic8f0f550dbbcab0678fbeb9bf45a478b0cea642d
diff --git a/svtools/source/control/ctrlbox.cxx
b/svtools/source/control/ctrlbox.cxx
index 80de8e5..b77b737 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -1896,8 +1896,7 @@ void FontSizeBox::SetRelative( sal_Bool bNewRelative )
SetDecimalDigits( 0 );
SetMin( nRelMin );
SetMax( nRelMax );
-SetCustomUnitText(OUString('%'));
-SetUnit( FUNIT_CUSTOM );
+SetUnit( FUNIT_PERCENT );
Clear();
sal_uInt16 i = nRelMin;
diff --git a/svx/source/dialog/relfld.cxx b/svx/source/dialog/relfld.cxx
index 67a4a59..4d5a505 100644
--- a/svx/source/dialog/relfld.cxx
+++ b/svx/source/dialog/relfld.cxx
@@ -102,8 +102,7 @@ void SvxRelativeField::SetRelative( sal_Bool bNewRelative )
SetDecimalDigits( 0 );
SetMin( nRelMin );
SetMax( nRelMax );
-SetCustomUnitText( OUString('%') );
-SetUnit( FUNIT_CUSTOM );
+SetUnit( FUNIT_PERCENT );
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - sc/source solenv/bin svx/source
sc/source/ui/src/scfuncs.src |2 -
solenv/bin/modules/installer/download.pm | 15 +---
solenv/bin/modules/installer/windows/component.pm | 37 +++---
solenv/bin/modules/installer/windows/directory.pm |3 +
solenv/bin/modules/installer/windows/feature.pm |3 +
solenv/bin/modules/installer/windows/msiglobal.pm |3 +
solenv/bin/modules/installer/windows/registry.pm |6 ++-
svx/source/sidebar/area/AreaPropertyPanel.src |2 -
8 files changed, 41 insertions(+), 30 deletions(-)
New commits:
commit 6e2c0fef5906a0b48384b21fda6f63e7485ce00d
Author: Tsutomu Uchino
Date: Mon Jan 20 09:55:08 2014 +
#i56998# add space before percent character in text and quick help
diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index d54afd6..f4116f8 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -5448,7 +5448,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
};
String 5 // Description of Parameter 2
{
-Text [ en-US ] = "The type of the quartile (0 = MIN, 1 = 25%, 2 =
50 %, 3 = 75 %, 4 =MAX)." ;
+Text [ en-US ] = "The type of the quartile (0 = MIN, 1 = 25 %, 2 =
50 %, 3 = 75 %, 4 = MAX)." ;
};
};
// -=*# Resource for function KGRÃSSTE #*=-
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.src
b/svx/source/sidebar/area/AreaPropertyPanel.src
index dba3cfe..5d31457 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.src
+++ b/svx/source/sidebar/area/AreaPropertyPanel.src
@@ -285,7 +285,7 @@ Control RID_POPUPPANEL_AREAPAGE_TRGR
Border = TRUE ;
Size = MAP_APPFONT ( CONTROL_WIDTH , MBOX_HEIGHT ) ;
HelpID = HID_PPROPERTYPANEL_AREA_MTR_TRGR_SVALUE ;
-QuickHelpText [ en-US ] = "Enter a transparency value for the
beginning point of the gradient, where 0% is fully opaque and 100 % is fully
transparent." ;
+QuickHelpText [ en-US ] = "Enter a transparency value for the
beginning point of the gradient, where 0 % is fully opaque and 100 % is fully
transparent." ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
commit 9d2066ac820a3b4ecf84d591d19c8b8d2bdecdd8
Author: Andre Fischer
Date: Mon Jan 20 09:00:29 2014 +
Fixed build breaker: Perl operator // not defined on all systems.
diff --git a/solenv/bin/modules/installer/download.pm
b/solenv/bin/modules/installer/download.pm
index de73339..5cf45c2 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -829,13 +829,16 @@ sub resolve_variables_in_downloadname
# Typical name: soa-{productversion}-{extension}-bin-{os}-{languages}
-my $productversion = $allvariables->{'PRODUCTVERSION'} // "";
+my $productversion = $allvariables->{'PRODUCTVERSION'};
+$productversion = "" unless defined $productversion;
$downloadname =~ s/\{productversion\}/$productversion/;
-my $packageversion = $allvariables->{'PACKAGEVERSION'} // "";
+my $packageversion = $allvariables->{'PACKAGEVERSION'};
+$packageversion = "" unless defined $packageversion;
$downloadname =~ s/\{packageversion\}/$packageversion/;
-my $extension = $allvariables->{'SHORT_PRODUCTEXTENSION'} // "";
+my $extension = $allvariables->{'SHORT_PRODUCTEXTENSION'};
+$extension = "" unless defined $extension;
$extension = lc($extension);
$downloadname =~ s/\{extension\}/$extension/;
@@ -1049,7 +1052,8 @@ sub put_publisher_into_template ($$)
{
my ($templatefile, $variables) = @_;
-my $publisher = $variables->{'OOOVENDOR'} // "";
+my $publisher = $variables->{'OOOVENDOR'};
+$publisher = "" unless defined $publisher;
replace_one_variable($templatefile, "PUBLISHERPLACEHOLDER", $publisher);
}
@@ -1062,7 +1066,8 @@ sub put_website_into_template ($$)
{
my ($templatefile, $variables) = @_;
-my $website = $variables->{'STARTCENTER_INFO_URL'} // "";
+my $website = $variables->{'STARTCENTER_INFO_URL'};
+$website = "" unless defined $website;
replace_one_variable($templatefile, "WEBSITEPLACEHOLDER", $website);
}
diff --git a/solenv/bin/modules/installer/windows/component.pm
b/solenv/bin/modules/installer/windows/component.pm
index 0383852..4f75fac 100644
--- a/solenv/bin/modules/installer/windows/component.pm
+++ b/solenv/bin/modules/installer/windows/component.pm
@@ -104,11 +104,12 @@ sub get_file_component_directory_for_file ($$)
{
my ($onefile, $dirref) = @_;
-my $localstyles = $onefile->{'Styles'} // "";
+my $localstyles = $onefile->{'Styles'};
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/printdlg.cxx |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 1cf4fd9f55b950991672428257d7242b234edc30
Author: Tsutomu Uchino
Date: Sat Jan 18 08:49:15 2014 +
Related: #i56998# add space separator between value and unit...
in fixed line around the preview on print dialog
(cherry picked from commit 99d599a9ff636dc16b42889ca5d2d7323f45cae4)
Conflicts:
vcl/source/window/printdlg.cxx
Change-Id: I632766cfbc89be32f5991890df0c5cc918263f00
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index bff8cf5..b19a53c 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -231,7 +231,8 @@ void PrintDialog::PrintPreviewWindow::setPreview( const
GDIMetaFile& i_rNewPrevi
}
Size aLogicPaperSize( LogicToLogic( i_rOrigSize, MapMode( MAP_100TH_MM ),
MapMode( eUnit ) ) );
OUString aNumText( rLocWrap.getNum( aLogicPaperSize.Width(), nDigits ) );
-aBuf.append( aNumText );
+aBuf.append( aNumText )
+.append( sal_Unicode( ' ' ) );
aBuf.appendAscii( eUnit == MAP_MM ? "mm" : "in" );
if( !i_rPaperName.isEmpty() )
{
@@ -242,7 +243,8 @@ void PrintDialog::PrintPreviewWindow::setPreview( const
GDIMetaFile& i_rNewPrevi
maHorzDim.SetText( aBuf.makeStringAndClear() );
aNumText = rLocWrap.getNum( aLogicPaperSize.Height(), nDigits );
-aBuf.append( aNumText );
+aBuf.append( aNumText )
+.append( sal_Unicode( ' ' ) );
aBuf.appendAscii( eUnit == MAP_MM ? "mm" : "in" );
maVertDim.SetText( aBuf.makeStringAndClear() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/dbgui/validate.src |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6874e5e291e9c643eaf06a84a6e5a32be496a37a
Author: Tsutomu Uchino
Date: Sat Jan 18 14:34:06 2014 +
Resolves: #i92785# fix label from Allow blank cells to...
Allow empty cells on Criteria tab of Validity dialog
Suggest By: joropo
(cherry picked from commit b363d736060a8ebe2117a37e0dfbd2e164f31db7)
Change-Id: I76eb3bb567bb24498f987d62dd970731faff4b83
diff --git a/sc/source/ui/dbgui/validate.src b/sc/source/ui/dbgui/validate.src
index b832d30..aa24552 100644
--- a/sc/source/ui/dbgui/validate.src
+++ b/sc/source/ui/dbgui/validate.src
@@ -125,7 +125,7 @@ TabPage TP_VALIDATION_VALUES
Pos = MAP_APPFONT ( 80 - OFFSET_X , 30 ) ;
Size = MAP_APPFONT ( 174 , 10 ) ;
TabStop = TRUE ;
-Text [ en-US ] = "Allow ~blank cells" ;
+Text [ en-US ] = "Allow ~empty cells" ;
};
CheckBox CB_SHOWLIST
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - cui/source svtools/source svx/source
cui/source/tabpages/autocdlg.cxx |4 ++--
svtools/source/control/ctrlbox.cxx |3 +--
svx/source/dialog/relfld.cxx |3 +--
svx/source/stbctrls/zoomctrl.cxx |6 +++---
4 files changed, 7 insertions(+), 9 deletions(-)
New commits:
commit 8f97a74f843edebca2b64cc3649c7a45a6ef3df0
Author: Tsutomu Uchino
Date: Sun Jan 19 15:15:38 2014 +
#i56998# add space separater before percent for Combine single line
paragraphs option in AutoCorrect dialog
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index dd82595..77895e1 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -753,7 +753,7 @@ void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet& )
nPercent = pOpt->nRightMargin;
sMargin = ' ';
sMargin += String::CreateFromInt32( nPercent );
-sMargin += '%';
+sMargin.AppendAscii( " %" );
pUserData = new ImpUserData(&sMargin, 0);
aCheckLB.SetUserData( MERGE_SINGLE_LINE_PARA, pUserData );
@@ -817,7 +817,7 @@ IMPL_LINK(OfaSwAutoFmtOptionsPage, EditHdl, PushButton*,
EMPTYARG)
nPercent = (sal_uInt16)aDlg.GetPrcntFld().GetValue();
sMargin = ' ';
sMargin += String::CreateFromInt32( nPercent );
-sMargin += '%';
+sMargin.AppendAscii( " %" );
}
}
aCheckLB.Invalidate();
commit c07254878c8728e76e1a7b34e9e32cf5c31d191b
Author: Tsutomu Uchino
Date: Sun Jan 19 14:40:52 2014 +
#i56998# add space separator between zoom value and percent on zoom
statusbar item
diff --git a/svx/source/stbctrls/zoomctrl.cxx b/svx/source/stbctrls/zoomctrl.cxx
index 214fa76..33369b7 100644
--- a/svx/source/stbctrls/zoomctrl.cxx
+++ b/svx/source/stbctrls/zoomctrl.cxx
@@ -132,7 +132,7 @@ void SvxZoomStatusBarControl::StateChanged( sal_uInt16,
SfxItemState eState,
const SfxUInt16Item* pItem = (const SfxUInt16Item*)pState;
nZoom = pItem->GetValue();
String aStr( String::CreateFromInt32(nZoom) );
-aStr += '%';
+aStr.AppendAscii( " %" );
GetStatusBar().SetItemText( GetId(), aStr );
if ( pState->ISA(SvxZoomItem) )
@@ -168,7 +168,7 @@ void SvxZoomStatusBarControl::StateChanged( sal_uInt16,
SfxItemState eState,
void SvxZoomStatusBarControl::Paint( const UserDrawEvent& )
{
String aStr( String::CreateFromInt32( nZoom ));
-aStr += '%';
+aStr.AppendAscii( " %" );
GetStatusBar().SetItemText( GetId(), aStr );
}
@@ -212,7 +212,7 @@ void SvxZoomStatusBarControl::Command( const CommandEvent&
rCEvt )
sal_uIntPtr SvxZoomStatusBarControl::GetDefItemWidth(const StatusBar& rStb)
{
-long nWidth1 = rStb.GetTextWidth(String::CreateFromAscii("X%"));
+long nWidth1 = rStb.GetTextWidth(String::CreateFromAscii("X %"));
return nWidth1;
}
commit fc6fc5b576b972a8ea0551091cc57aa1cfe1334d
Author: Tsutomu Uchino
Date: Sun Jan 19 14:16:45 2014 +
#i56998# use FUNIT_PERCENT on fields that allow relative value
diff --git a/svtools/source/control/ctrlbox.cxx
b/svtools/source/control/ctrlbox.cxx
index 537e4e6..a72487b 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -1387,8 +1387,7 @@ void FontSizeBox::SetRelative( sal_Bool bNewRelative )
SetDecimalDigits( 0 );
SetMin( nRelMin );
SetMax( nRelMax );
-SetCustomUnitText( '%' );
-SetUnit( FUNIT_CUSTOM );
+SetUnit( FUNIT_PERCENT );
Clear();
sal_uInt16 i = nRelMin;
diff --git a/svx/source/dialog/relfld.cxx b/svx/source/dialog/relfld.cxx
index bbf7010..ded8404 100644
--- a/svx/source/dialog/relfld.cxx
+++ b/svx/source/dialog/relfld.cxx
@@ -123,8 +123,7 @@ void SvxRelativeField::SetRelative( sal_Bool bNewRelative )
SetDecimalDigits( 0 );
SetMin( nRelMin );
SetMax( nRelMax );
-SetCustomUnitText( String( sal_Unicode( '%' ) ) );
-SetUnit( FUNIT_CUSTOM );
+SetUnit( FUNIT_PERCENT );
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - chart2/source cui/source sc/source sd/source starmath/source svx/source sw/source
chart2/source/controller/dialogs/tp_3D_SceneGeometry.src |3 chart2/source/controller/dialogs/tp_SeriesToAxis.src |6 - cui/source/dialogs/colorpicker.src | 18 +--- cui/source/dialogs/grfflt.src|6 - cui/source/dialogs/zoom.src |5 - cui/source/options/optgdlg.src |6 - cui/source/tabpages/autocdlg.src |3 cui/source/tabpages/backgrnd.src |6 - cui/source/tabpages/chardlg.src |9 -- cui/source/tabpages/grfpage.src |6 - cui/source/tabpages/numpages.src |3 cui/source/tabpages/paragrph.src |3 cui/source/tabpages/tabarea.src | 59 --- cui/source/tabpages/tabline.src |6 - cui/source/tabpages/tparea.cxx |4 - cui/source/tabpages/tplnedef.cxx |8 +- sc/source/ui/pagedlg/pagedlg.src |3 sd/source/ui/animations/CustomAnimationDialog.src|3 starmath/source/dialog.cxx |3 starmath/source/smres.src| 27 ++ svx/source/dialog/bmpmask.src| 12 +-- svx/source/dialog/contdlg.src|3 svx/source/dialog/fontwork.cxx |2 svx/source/dialog/fontwork.src |1 svx/source/engine3d/float3d.src |9 -- svx/source/sidebar/area/AreaPropertyPanel.src| 28 ++- svx/source/sidebar/graphic/GraphicPropertyPanel.src | 20 + svx/source/sidebar/line/LinePropertyPanel.src|3 svx/source/sidebar/paragraph/ParaPropertyPanel.src |3 svx/source/tbxctrls/fontworkgallery.src |3 sw/source/ui/frmdlg/column.src |3 sw/source/ui/misc/pgfnote.src|3 32 files changed, 95 insertions(+), 182 deletions(-) New commits: commit 4f5b26a97dbaef964af1fe323f24109b987cb952 Author: Tsutomu Uchino Date: Sun Jan 19 13:40:29 2014 + #i56998# use FUNIT_PERCENT instead of FUNIT_CUSTOM with parcent CustomUnitText on metric fields diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src index 0a5c463..879d7e3 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src +++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src @@ -143,8 +143,7 @@ TabPage TP_3D_SCENEGEOMETRY First = 0 ; Last = 100 ; SpinSize = 5 ; -Unit = FUNIT_CUSTOM ; -CustomUnitText = "%" ; +Unit = FUNIT_PERCENT ; }; }; diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.src b/chart2/source/controller/dialogs/tp_SeriesToAxis.src index ae43dfc..d0a3944 100644 --- a/chart2/source/controller/dialogs/tp_SeriesToAxis.src +++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.src @@ -77,8 +77,7 @@ TabPage TP_OPTIONS Minimum = -100 ; Maximum = 100 ; StrictFormat = TRUE ; -Unit = FUNIT_CUSTOM ; -CustomUnitText = "%" ; +Unit = FUNIT_PERCENT ; First = 1 ; Last = 100 ; SpinSize = 1 ; @@ -104,8 +103,7 @@ TabPage TP_OPTIONS Minimum = 0 ; Maximum = 600 ; StrictFormat = TRUE ; -Unit = FUNIT_CUSTOM ; -CustomUnitText = "%" ; +Unit = FUNIT_PERCENT ; First = 1 ; Last = 100 ; SpinSize = 1 ; diff --git a/cui/source/dialogs/colorpicker.src b/cui/source/dialogs/colorpicker.src index 988d7bd..72c9156 100644 --- a/cui/source/dialogs/colorpicker.src +++ b/cui/source/dialogs/colorpicker.src @@ -322,8 +322,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER Spin = TRUE ; Maximum = 100 ; Last = 100 ; -Unit = FUNIT_CUSTOM ; -CustomUnitText = "%" ; +Unit = FUNIT_PERCENT ; }; FixedText CT_BRIGHTNESS @@ -344,8 +343,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER Spin = TRUE ; Maximum = 100 ; Last = 100 ; -Unit = FUNIT_CUSTOM ; -CustomUnitText = "%" ; +Unit = FUNIT_PERCENT ; }; // - @@ -377,8 +375,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER Spin = TRUE ; Maximum = 100 ; Last = 100 ; -Unit = FUNIT_CUSTOM ; -CustomUnitText = "%" ; +Unit = FUNIT_PERCENT ; }; FixedText CT_MAGENTA @@ -399,8 +396,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER Spin = TRUE ; Maximu
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - avmedia/source svx/source vcl/source
avmedia/source/framework/mediacontrol.src |6 +++---
svx/source/items/svxitems.src |6 +++---
svx/source/stbctrls/stbctrls.src | 10 +-
vcl/source/control/field.cxx |2 +-
4 files changed, 12 insertions(+), 12 deletions(-)
New commits:
commit f17513bf90f3ad1dd0cd991f6569a38d9c8c0782
Author: Tsutomu Uchino
Date: Sun Jan 19 12:02:25 2014 +
#i56998 add space before percent in zoom strings
diff --git a/avmedia/source/framework/mediacontrol.src
b/avmedia/source/framework/mediacontrol.src
index 7d1246a..91f166d 100644
--- a/avmedia/source/framework/mediacontrol.src
+++ b/avmedia/source/framework/mediacontrol.src
@@ -81,21 +81,21 @@ String AVMEDIA_STR_ZOOM
String AVMEDIA_STR_ZOOM_50
{
-Text[en-US] = "50%";
+Text[en-US] = "50 %";
};
//
--
String AVMEDIA_STR_ZOOM_100
{
-Text[en-US] = "100%";
+Text[en-US] = "100 %";
};
//
--
String AVMEDIA_STR_ZOOM_200
{
-Text[en-US] = "200%";
+Text[en-US] = "200 %";
};
//
--
diff --git a/svx/source/items/svxitems.src b/svx/source/items/svxitems.src
index cf064cd..ba0abd1 100644
--- a/svx/source/items/svxitems.src
+++ b/svx/source/items/svxitems.src
@@ -197,15 +197,15 @@ String RID_SVXITEMS_BRUSHSTYLE_DOWNDIAG
};
String RID_SVXITEMS_BRUSHSTYLE_25
{
-Text = "25%" ;
+Text = "25 %" ;
};
String RID_SVXITEMS_BRUSHSTYLE_50
{
-Text = "50%" ;
+Text = "50 %" ;
};
String RID_SVXITEMS_BRUSHSTYLE_75
{
-Text = "75%" ;
+Text = "75 %" ;
};
String RID_SVXITEMS_BRUSHSTYLE_BITMAP
{
diff --git a/svx/source/stbctrls/stbctrls.src b/svx/source/stbctrls/stbctrls.src
index 37ea191..c02f38e 100644
--- a/svx/source/stbctrls/stbctrls.src
+++ b/svx/source/stbctrls/stbctrls.src
@@ -93,31 +93,31 @@ Menu RID_SVXMNU_ZOOM
{
Identifier = ZOOM_200 ;
HelpId = HID_MNU_ZOOM_200 ;
-Text = "200%" ;
+Text = "200 %" ;
};
MenuItem
{
Identifier = ZOOM_150 ;
HelpId = HID_MNU_ZOOM_150 ;
-Text = "150%" ;
+Text = "150 %" ;
};
MenuItem
{
Identifier = ZOOM_100 ;
HelpId = HID_MNU_ZOOM_100 ;
-Text = "100%" ;
+Text = "100 %" ;
};
MenuItem
{
Identifier = ZOOM_75 ;
HelpId = HID_MNU_ZOOM_75 ;
-Text = "75%" ;
+Text = "75 %" ;
};
MenuItem
{
Identifier = ZOOM_50 ;
HelpId = HID_MNU_ZOOM_50 ;
-Text = "50%" ;
+Text = "50 %" ;
};
MenuItem
{
commit 20f2a4b272f9fa879b8c30495fed3c462ea78a2f
Author: Tsutomu Uchino
Date: Sun Jan 19 11:50:38 2014 +
#i56998# space separater required before parcent character in metric field
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 2e0c738..86b6019 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -1586,7 +1586,7 @@ XubString MetricFormatter::CreateFieldText( sal_Int64
nValue ) const
aStr += maCustomUnitText;
else
{
-if ( meUnit != FUNIT_NONE && meUnit != FUNIT_PERCENT )
+if ( meUnit != FUNIT_NONE )
aStr += xub_Unicode( ' ' );
aStr += ImplMetricToString( meUnit );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sc/source
sc/source/ui/dbgui/validate.src |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b363d736060a8ebe2117a37e0dfbd2e164f31db7
Author: Tsutomu Uchino
Date: Sat Jan 18 14:34:06 2014 +
#i92785# fix label from Allow blank cells to Allow empty cells on Criteria
tabl of Validity dialog
Suggest By: joropo
diff --git a/sc/source/ui/dbgui/validate.src b/sc/source/ui/dbgui/validate.src
index 9974f13..9a9662a 100644
--- a/sc/source/ui/dbgui/validate.src
+++ b/sc/source/ui/dbgui/validate.src
@@ -197,7 +197,7 @@ TabPage TP_VALIDATION_VALUES
//-->Modified by PengYunQuan for Validity Cell Range Picker
Size = MAP_APPFONT ( 174 , 10 ) ;
TabStop = TRUE ;
-Text [ en-US ] = "Allow ~blank cells" ;
+Text [ en-US ] = "Allow ~empty cells" ;
};
CheckBox CB_SHOWLIST
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - wizards/source
wizards/source/importwizard/DialogModul.xba | 38 ++-- wizards/source/importwizard/FilesModul.xba |2 - 2 files changed, 20 insertions(+), 20 deletions(-) New commits: commit 264a2a318aa9e26eb37b07d6676f96045e88ea3d Author: Tsutomu Uchino Date: Sat Jan 18 13:21:35 2014 + #i95102# support Office 2007 file extensions on the Document Converter diff --git a/wizards/source/importwizard/DialogModul.xba b/wizards/source/importwizard/DialogModul.xba index a83733c..23bf20d 100644 --- a/wizards/source/importwizard/DialogModul.xba +++ b/wizards/source/importwizard/DialogModul.xba @@ -89,7 +89,7 @@ Public XMLTemplateList() ' Applications(X,8) = "File:///..." (TargetUrl of the templates) ' Applications(X,9) = 0 (Key to the original Index of the Applications) -Public Const SBMAXEXTENSIONLENGTH = 15 +Public Const SBMAXEXTENSIONLENGTH = 17 Sub FillStep_Welcome() @@ -412,40 +412,40 @@ Sub SetupMSConfiguration() sValueName(2) = "" ' See definition of Filtername-Array about meaning of fields - MSFilterName(0,0) = "doc" - MSFilterName(0,1) = "writer8" - MSFilterName(0,2) = "odt" + MSFilterName(0,0) = "doc|docx|docm" + MSFilterName(0,1) = "writer8|writer8|writer8" + MSFilterName(0,2) = "odt|odt|odt" MSFilterName(0,3) = sMSDocumentCheckBox(0) MSFilterName(0,4) = "Word" - MSFilterName(1,0) = "xls" - MSFilterName(1,1) = "calc8" - MSFilterName(1,2) = "ods" + MSFilterName(1,0) = "xls|xlsx|xlsm" + MSFilterName(1,1) = "calc8|calc8|calc8" + MSFilterName(1,2) = "ods|ods|ods" MSFilterName(1,3) = sMSDocumentCheckBox(1) MSFilterName(1,4) = "Excel" - MSFilterName(2,0) = "ppt|pps" - MSFilterName(2,1) = "impress8|impress8" - MSFilterName(2,2) = "odp|odp" + MSFilterName(2,0) = "ppt|pps|pptx|pptm" + MSFilterName(2,1) = "impress8|impress8|impress8|impress8" + MSFilterName(2,2) = "odp|odp|odp|odp" MSFilterName(2,3) = sMSDocumentCheckBox(2) MSFilterName(2,4) = "PowerPoint" - MSFilterName(3,0) = "dot" - MSFilterName(3,1) = "writer8_template" - MSFilterName(3,2) = "ott" + MSFilterName(3,0) = "dot|dotx|dotm" + MSFilterName(3,1) = "writer8_template|writer8_template|writer8_template" + MSFilterName(3,2) = "ott|ott|ott" MSFilterName(3,3) = sMSTemplateCheckBox(0) MSFilterName(3,4) = "Word" - MSFilterName(4,0) = "xlt" - MSFilterName(4,1) = "calc8_template" - MSFilterName(4,2) = "ots" + MSFilterName(4,0) = "xlt|xltx|xltm" + MSFilterName(4,1) = "calc8_template|calc8_template|calc8_template" + MSFilterName(4,2) = "ots|ots|ots" MSFilterName(4,3) = sMSTemplateCheckBox(1) MSFilterName(4,4) = "Excel" - MSFilterName(5,0) = "pot" - MSFilterName(5,1) = "impress8_template" - MSFilterName(5,2) = "otp" + MSFilterName(5,0) = "pot|potx|potm" + MSFilterName(5,1) = "impress8_template|impress8_template|impress8_template" + MSFilterName(5,2) = "otp|otp|otp" MSFilterName(5,3) = sMSTemplateCheckBox(2) MSFilterName(5,4) = "PowerPoint" End Sub diff --git a/wizards/source/importwizard/FilesModul.xba b/wizards/source/importwizard/FilesModul.xba index 27834e7..eaf92bb 100644 --- a/wizards/source/importwizard/FilesModul.xba +++ b/wizards/source/importwizard/FilesModul.xba @@ -456,7 +456,7 @@ Dim s as Integer FirstList(i,1) = SecList(s,1) sLocExtension = lcase(FirstList(i,1)) Select Case sLocExtension - Case "sdw", "sdc", "sda", "sdd", "smf", "sgl", "doc", "xls", "ppt", "sxi" , "sxw" , "sxd" , "sxg" , "sxm" , "sxc" , "pps" + Case "sdw", "sdc", "sda", "sdd", "smf", "sgl", "doc", "xls", "ppt", "sxi" , "sxw" , "sxd" , "sxg" , "sxm" , "sxc" , "pps" , "docx" , "docm" , "xlsx" , "xlsm" , "xlsb" , "pptx" , "pptm" AbsDocuFound = AbsDocuFound + 1 Case else AbsTemplateFound = AbsTemplateFound + 1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - chart2/source cui/source editeng/source sc/source sd/source svx/source sw/source vcl/source
chart2/source/controller/dialogs/tp_SeriesToAxis.src|4 +-
cui/source/dialogs/colorpicker.cxx |4 --
cui/source/dialogs/colorpicker.src | 12
cui/source/dialogs/grfflt.src |4 +-
cui/source/dialogs/zoom.src |2 -
cui/source/tabpages/tabline.src |6 ++--
editeng/source/items/frmitems.cxx | 22 +---
editeng/source/items/paraitem.cxx |3 ++
editeng/source/items/textitem.cxx |9 +-
sc/source/core/data/docpool.cxx |2 +
sd/source/ui/animations/CustomAnimationDialog.src |6 ++--
sd/source/ui/animations/SlideTransitionPane.src |2 -
svx/source/dialog/bmpmask.src |8 ++---
svx/source/engine3d/float3d.src |6 ++--
svx/source/items/algitem.cxx|4 ++
svx/source/sidebar/text/TextCharacterSpacingControl.cxx |2 +
svx/source/sidebar/text/TextPropertyPanel.src |8 ++---
svx/source/svdraw/svdattr.cxx |1
svx/source/svdraw/svdomeas.cxx |5 ++-
svx/source/xoutdev/xattr.cxx|3 ++
sw/source/ui/utlui/attrdesc.cxx |4 ++
sw/source/ui/utlui/uiitems.cxx |1
vcl/source/control/field.cxx|5 ++-
vcl/source/window/printdlg.cxx |6 ++--
24 files changed, 86 insertions(+), 43 deletions(-)
New commits:
commit acac627b8aed3353e542ce41fa9a7064e4d1790b
Author: Tsutomu Uchino
Date: Sat Jan 18 09:52:44 2014 +
#i56998# percent value should not takes space separator before the character
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index bd990f2..2e0c738 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -1586,7 +1586,7 @@ XubString MetricFormatter::CreateFieldText( sal_Int64
nValue ) const
aStr += maCustomUnitText;
else
{
-if ( meUnit != FUNIT_NONE || meUnit != FUNIT_PERCENT )
+if ( meUnit != FUNIT_NONE && meUnit != FUNIT_PERCENT )
aStr += xub_Unicode( ' ' );
aStr += ImplMetricToString( meUnit );
}
commit 99d599a9ff636dc16b42889ca5d2d7323f45cae4
Author: Tsutomu Uchino
Date: Sat Jan 18 08:49:15 2014 +
#i56998# add space separator between value and unit in fixed line around
the preview on print dialog
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index c874b5e..50f1889 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -366,7 +366,8 @@ void PrintDialog::PrintPreviewWindow::setPreview( const
GDIMetaFile& i_rNewPrevi
}
Size aLogicPaperSize( LogicToLogic( i_rOrigSize, MapMode( MAP_100TH_MM ),
MapMode( eUnit ) ) );
String aNumText( rLocWrap.getNum( aLogicPaperSize.Width(), nDigits ) );
-aBuf.append( aNumText );
+aBuf.append( aNumText )
+.append( sal_Unicode( ' ' ) );
aBuf.appendAscii( eUnit == MAP_MM ? "mm" : "in" );
if( i_rPaperName.getLength() )
{
@@ -377,7 +378,8 @@ void PrintDialog::PrintPreviewWindow::setPreview( const
GDIMetaFile& i_rNewPrevi
maHorzDim.SetText( aBuf.makeStringAndClear() );
aNumText = rLocWrap.getNum( aLogicPaperSize.Height(), nDigits );
-aBuf.append( aNumText );
+aBuf.append( aNumText )
+.append( sal_Unicode( ' ' ) );
aBuf.appendAscii( eUnit == MAP_MM ? "mm" : "in" );
maVertDim.SetText( aBuf.makeStringAndClear() );
commit 0cea884e3f417e4b58d2fdcfc7b0111f3bfc6f30
Author: Tsutomu Uchino
Date: Sat Jan 18 08:14:47 2014 +
#i56998# add a space separater between value and unit and remove separator
between value and percent to match with ISO 31-0
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.src
b/chart2/source/controller/dialogs/tp_SeriesToAxis.src
index d782f68..ae43dfc 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.src
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.src
@@ -78,7 +78,7 @@ TabPage TP_OPTIONS
Maximum = 100 ;
StrictFormat = TRUE ;
Unit = FUNIT_CUSTOM ;
-CustomUnitText = " %" ;
+CustomUnitText = "%" ;
First = 1 ;
Last = 100 ;
SpinSize = 1 ;
@@ -105,7 +105,7 @@ TabPage TP_OPTIONS
Maximum = 600 ;
StrictFormat = TRUE ;
Unit = FUNIT_CUSTOM ;
-CustomUnitText = " %" ;
+CustomUnitText = "%" ;
First = 1 ;
Last = 100 ;
SpinSize = 1 ;
diff --git a/cui/source/dialogs/colorpicker.cxx
b/cui/source/dialogs/c
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - wizards/com
wizards/com/sun/star/wizards/letter/LocaleCodes.java |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3e878f6ea157ec0aaa47c1f4dbaf039b9de1a103
Author: Tsutomu Uchino
Date: Sat Jan 18 02:36:25 2014 +
#i124045# fix resource id for STR_ARR_SVT_LANGUAGE_TABLE used in Letter
wizard to match with svtools.hrc
diff --git a/wizards/com/sun/star/wizards/letter/LocaleCodes.java
b/wizards/com/sun/star/wizards/letter/LocaleCodes.java
index 2078d68..4904364 100644
--- a/wizards/com/sun/star/wizards/letter/LocaleCodes.java
+++ b/wizards/com/sun/star/wizards/letter/LocaleCodes.java
@@ -36,7 +36,7 @@ public class LocaleCodes extends Resource
public LocaleCodes(XMultiServiceFactory xmsf)
{
super(xmsf, UNIT_NAME, MODULE_NAME);
-allLanguageStrings = getStringList(16635); //
STR_ARR_SVT_LANGUAGE_TABLE from svtools/source/misc/langtab.src
+allLanguageStrings = getStringList(16638); //
STR_ARR_SVT_LANGUAGE_TABLE from svtools/source/misc/langtab.src
}
public String getLanguageString(String MSID)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - offapi/com vcl/source
offapi/com/sun/star/awt/XMouseMotionListener.idl |2 +-
vcl/source/gdi/outdev3.cxx | 13 -
2 files changed, 13 insertions(+), 2 deletions(-)
New commits:
commit 77e7702250359f9398737e3a4af1bb9b4cc9c1c9
Author: Tsutomu Uchino
Date: Mon Jan 13 09:14:35 2014 +
Resolves: #i72591# fix from mouse button to mouse pointer...
in documentation of mouseMoved method
Patch By: christianjun...@gmail.com
(cherry picked from commit a66c0e11c326a072f0cb609af35d5e9d77fd3b63)
Change-Id: Ia39fc56d4459f303cd48e5654d8ff35155cceb4a
diff --git a/offapi/com/sun/star/awt/XMouseMotionListener.idl
b/offapi/com/sun/star/awt/XMouseMotionListener.idl
index 10d7422..d866aef 100644
--- a/offapi/com/sun/star/awt/XMouseMotionListener.idl
+++ b/offapi/com/sun/star/awt/XMouseMotionListener.idl
@@ -44,7 +44,7 @@ published interface XMouseMotionListener:
com::sun::star::lang::XEventListener
void mouseDragged( [in] com::sun::star::awt::MouseEvent e );
-/** is invoked when the mouse button has been moved on a window
+/** is invoked when the mouse pointer has been moved on a window
(with no buttons down).
*/
void mouseMoved( [in] com::sun::star::awt::MouseEvent e );
commit 0198f54d25e6ec939ca4f341169d0c90d47b56d1
Author: Caolán McNamara
Date: Mon Jan 13 11:22:58 2014 +
longparas: make OutputDevice::GetGlyphBoundRects safe
Change-Id: I3dbb42b14a03c5bd98ebc1f67963ffe4c5e4b6b8
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index b888e77..0ba187b 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -7185,8 +7185,19 @@ sal_Bool OutputDevice::GetGlyphBoundRects( const Point&
rOrigin, const OUString&
rVector.clear();
-if( nLen == STRING_LEN )
+if(nLen == 0x0)
+{
+SAL_INFO("sal.rtl.xub",
+ "GetGlyphBoundRects Suspicious arguments nLen:" << nLen);
+}
+
+if( nIndex >= rStr.getLength() )
+return false;
+
+if( nLen < 0 || nIndex + nLen >= rStr.getLength() )
+{
nLen = rStr.getLength() - nIndex;
+}
Rectangle aRect;
for( int i = 0; i < nLen; i++ )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - offapi/com sc/source
offapi/com/sun/star/awt/XMouseMotionListener.idl |2 +-
sc/source/core/data/drwlayer.cxx |6 ++
2 files changed, 7 insertions(+), 1 deletion(-)
New commits:
commit a66c0e11c326a072f0cb609af35d5e9d77fd3b63
Author: Tsutomu Uchino
Date: Mon Jan 13 09:14:35 2014 +
#i72591# fix from mouse button to mouse pointer in documentation of
mouseMoved method
Patch By: christianjun...@gmail.com
diff --git a/offapi/com/sun/star/awt/XMouseMotionListener.idl
b/offapi/com/sun/star/awt/XMouseMotionListener.idl
index 4d5ada4..223d6d9 100644
--- a/offapi/com/sun/star/awt/XMouseMotionListener.idl
+++ b/offapi/com/sun/star/awt/XMouseMotionListener.idl
@@ -56,7 +56,7 @@ published interface XMouseMotionListener:
com::sun::star::lang::XEventListener
//-
-/** is invoked when the mouse button has been moved on a window
+/** is invoked when the mouse pointer has been moved on a window
(with no buttons down).
*/
void mouseMoved( [in] com::sun::star::awt::MouseEvent e );
commit 0635f5cb82f0bb0717b8e74cded79a6fbb0f064c
Author: Tsutomu Uchino
Date: Mon Jan 13 08:23:02 2014 +
#i91494# use the same font height for CJK text with Western in drawing
object on Calc drawing layer
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 3f4e2d5..838a8a1 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -274,10 +274,16 @@ ScDrawLayer::ScDrawLayer( ScDocument* pDocument, const
String& rName ) :
// #95129# SJ: set FontHeight pool defaults without changing static
SdrEngineDefaults
SfxItemPool* pOutlinerPool = rOutliner.GetEditTextObjectPool();
if ( pOutlinerPool )
+{
pItemPool->SetPoolDefaultItem(SvxFontHeightItem( 423, 100,
EE_CHAR_FONTHEIGHT )); // 12Pt
+ pItemPool->SetPoolDefaultItem(SvxFontHeightItem( 423, 100,
EE_CHAR_FONTHEIGHT_CJK )); // 12Pt
+}
SfxItemPool* pHitOutlinerPool = rHitOutliner.GetEditTextObjectPool();
if ( pHitOutlinerPool )
+{
pHitOutlinerPool->SetPoolDefaultItem(SvxFontHeightItem( 423, 100,
EE_CHAR_FONTHEIGHT ));// 12Pt
+ pHitOutlinerPool->SetPoolDefaultItem(SvxFontHeightItem( 423, 100,
EE_CHAR_FONTHEIGHT_CJK ));// 12Pt
+}
// initial undo mode as in Calc document
if( pDoc )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - odk/docs odk/examples odk/index.html
odk/docs/install.html | 22 +++--- odk/docs/tools.html|5 ++--- odk/examples/examples.html |4 ++-- odk/index.html |4 ++-- 4 files changed, 17 insertions(+), 18 deletions(-) New commits: commit 8cae5708c761ba10a87f3616a669df03e6ba0039 Author: Tsutomu Uchino Date: Sun Jan 12 12:02:24 2014 + #i124015# fix errors in html files of SDK diff --git a/odk/docs/install.html b/odk/docs/install.html index e3a12cb..5f94d66 100644 --- a/odk/docs/install.html +++ b/odk/docs/install.html @@ -68,7 +68,7 @@ - Apache OpenOffice %PRODUCT_RELEASE% installation + Apache OpenOffice %PRODUCT_RELEASE% installation The SDK works on top of an existing office installation and uses the same libraries as the office installation. @@ -77,7 +77,7 @@ - JDK (1.5 or higher) + JDK (1.5 or higher) A JDK is necessary for developing Java components or applications. An appropriate Java SDK can be found on http://java.sun.com/products"; title="link to the Java SDK download page (online)">http://java.sun.com/products. Recommendation is to use Java 6 excepting for Mac OS because initially Mac OS supported a 64bit version of Java 6 only. @@ -87,7 +87,7 @@ - C++ compiler + C++ compiler A C++ compiler is necessary for developing C++ components or applications. UNO depends on a compiler dependent language binding, so that we use the appropriate compiler where a language binding @@ -106,13 +106,13 @@ Microsoft C++ Compiler, Microsoft Visual Studio 2008 or the Express version (cl, version 15.00.21022) - Note: The C++ compiler is optional! If you use the Express edition you have to ensure that the http://www.microsoft.com/downloads/details.aspx?familyid=9B2DA534-3E03-4391-8A4D-074B9F2BC1BF&displaylang=en";>Microsoft Visual Studio 2008 Redistributable Package is also installed. You can download this package from Microsoft directly. + Note: The C++ compiler is optional! If you use the Express edition you have to ensure that the http://www.microsoft.com/downloads/details.aspx?familyid=9B2DA534-3E03-4391-8A4D-074B9F2BC1BF&displaylang=en";>Microsoft Visual Studio 2008 Redistributable Package is also installed. You can download this package from Microsoft directly. - Microsoft .NET Framework SDK version 1.0 or higher + Microsoft .NET Framework SDK version 1.0 or higher The SDK is required for building CLI applications. That is, programs written in languages, such as C# or VB.NET. Note: The .NET Framework is optional! @@ -121,7 +121,7 @@ - GNU make (3.79.1 or higher) + GNU make (3.79.1 or higher) GNU make is used to build the examples of the SDK. GNU make is available from http://www.gnu.org"; title="link to www.gnu.org (online)">http://www.gnu.org. It can be ftped via ftp://ftp.gnu.org/gnu/make"; title="link to gnumake on www.gnu.org (online)">ftp://ftp.gnu.org/gnu/make Note: Windows user can find an executable of gnu make under http://www.mingw.org/wiki/Getting_Started"; title="link to the MinGW Getting Started wiki (online)">http://www.mingw.org/wiki/Getting_Started (see the mingw32-make link under "Manual Installation"). Do not use the Cygwin make, because it does not @@ -131,7 +131,7 @@ - zip tool (2.3 or higher) + zip tool (2.3 or higher) The zip tool is used to create UNO packages. zip is a new requirement to make the SDK independent of a Java SDK. If you do not have these already, you can download them from http://www.info-zip.org"; title="link to www.ubfi-zip.org (online)">http://www.info-zip.org. Note: The cygwin zip.exe does not work for the build under @@ -141,7 +141,7 @@ - cat and sed tools + cat and sed tools The cat and set tools are used to create some extensions. Note for Windows users: If you do not have these already, you can download them from http://sourceforge.net/projects/unxutils/files/latest/downloadg"; title="link to UnxUtils (online)">http://sourceforge.net/projects/unxutils/files/latest/download. @@ -150,7 +150,7 @@
[Libreoffice-commits] core.git: sc/source
sc/source/ui/app/inputwin.cxx | 36 ++--
1 file changed, 34 insertions(+), 2 deletions(-)
New commits:
commit 10e3880eb10d8e5c08bd7a254577ba4b0bd25534
Author: Tsutomu Uchino
Date: Fri Jan 10 11:47:19 2014 +
Resolves: #i42309# change behavior for equal button of input line...
according to the current content of the cell
(cherry picked from commit ff1d1ea1f5f15ce7888957d09f4783d8055c7654)
Conflicts:
sc/source/ui/app/inputwin.cxx
Change-Id: I054aa55de14e2dec5a9ace1124d7eb6aa261162f
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 0407276..5f7b032 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -510,12 +510,44 @@ void ScInputWindow::Select()
if ( pScMod->IsEditMode() ) // nicht, wenn z.B. geschuetzt
{
aTextWindow.StartEditEngine();
-aTextWindow.SetTextString(OUString('='));
+
+sal_Int32 nStartPos = 1;
+sal_Int32 nEndPos = 1;
+
+ScTabViewShell* pViewSh = PTR_CAST( ScTabViewShell,
SfxViewShell::Current() );
+if ( pViewSh )
+{
+const OUString& rString = aTextWindow.GetTextString();
+const sal_Int32 nLen = rString.getLength();
+
+ScDocument* pDoc = pViewSh->GetViewData()->GetDocument();
+CellType eCellType = pDoc->GetCellType(
pViewSh->GetViewData()->GetCurPos() );
+switch ( eCellType )
+{
+case CELLTYPE_VALUE:
+{
+nEndPos = nLen + 1;
+aTextWindow.SetTextString("=" + rString);
+break;
+}
+case CELLTYPE_STRING:
+case CELLTYPE_EDIT:
+nStartPos = 0;
+nEndPos = nLen;
+break;
+case CELLTYPE_FORMULA:
+nEndPos = nLen;
+break;
+default:
+aTextWindow.SetTextString("=");
+break;
+}
+}
EditView* pView = aTextWindow.GetEditView();
if (pView)
{
-pView->SetSelection( ESelection(0,1, 0,1) );
+pView->SetSelection( ESelection(0, nStartPos, 0, nEndPos)
);
pScMod->InputChanged(pView);
SetOkCancelMode();
pView->SetEditEngineUpdateMode(sal_True);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - svtools/source
svtools/source/edit/textview.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 2f28d991921468e745d16996bb0c6e84258c9c20
Author: Tsutomu Uchino
Date: Sat Jan 11 09:17:58 2014 +
#i106665# fix failed to replace with empty string on text view
diff --git a/svtools/source/edit/textview.cxx b/svtools/source/edit/textview.cxx
index fc9dae9..4558663 100644
--- a/svtools/source/edit/textview.cxx
+++ b/svtools/source/edit/textview.cxx
@@ -1378,7 +1378,7 @@ void TextView::InsertNewText( const rtl::OUString& rStr,
sal_Bool bSelect )
*/
sal_Int32 nLen = rStr.getLength();
sal_Int32 nPos = 0;
-while( nLen )
+do
{
sal_Int32 nChunkLen = nLen > 65534 ? 65534 : nLen;
String aChunk( rStr.copy( nPos, nChunkLen ) );
@@ -1400,7 +1400,7 @@ void TextView::InsertNewText( const rtl::OUString& rStr,
sal_Bool bSelect )
ImpSetSelection( aNewSel );
nLen -= nChunkLen;
nPos += nChunkLen;
-}
+} while( nLen );
mpImpl->mpTextEngine->UndoActionEnd();
mpImpl->mpTextEngine->FormatAndUpdate( this );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sd/source
sd/source/ui/slideshow/slideshowimpl.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 20a6f8163ffab9aeed1b2886e771a254a43120ec
Author: Tsutomu Uchino
Date: Fri Jan 10 15:30:03 2014 +
#i97129# fix hidden slide shown when going back to previous slide from
finish screen
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx
b/sd/source/ui/slideshow/slideshowimpl.cxx
index 9ceaac2..59b95d4 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -3381,7 +3381,7 @@ void SlideshowImpl::gotoPreviousSlide (const bool
bSkipAllMainSequenceEffects)
const ShowWindowMode eMode = mpShowWindow->GetShowWindowMode();
if( eMode == SHOWWINDOWMODE_END )
{
-const sal_Int32 nLastSlideIndex =
mpSlideController->getSlideIndexCount() - 1;
+const sal_Int32 nLastSlideIndex =
mpSlideController->getCurrentSlideIndex();
if( nLastSlideIndex >= 0 )
mpShowWindow->RestartShow( nLastSlideIndex );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sc/source
sc/source/ui/app/inputwin.cxx | 38 --
1 file changed, 36 insertions(+), 2 deletions(-)
New commits:
commit ff1d1ea1f5f15ce7888957d09f4783d8055c7654
Author: Tsutomu Uchino
Date: Fri Jan 10 11:47:19 2014 +
#i42309# change behavior for equal button of input line according to the
current content of the cell
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index cbc7d43..3351f92 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -461,12 +461,46 @@ void __EXPORT ScInputWindow::Select()
if ( pScMod->IsEditMode() ) // nicht, wenn z.B. geschuetzt
{
aTextWindow.GrabFocus();
-aTextWindow.SetTextString( '=' );
+
+xub_StrLen nStartPos = 1;
+xub_StrLen nEndPos = 1;
+
+ScTabViewShell* pViewSh = PTR_CAST( ScTabViewShell,
SfxViewShell::Current() );
+if ( pViewSh )
+{
+const String& aString = aTextWindow.GetTextString();
+const xub_StrLen nLen = aString.Len();
+
+ScDocument* pDoc = pViewSh->GetViewData()->GetDocument();
+CellType eCellType = pDoc->GetCellType(
pViewSh->GetViewData()->GetCurPos() );
+switch ( eCellType )
+{
+case CELLTYPE_VALUE:
+{
+nEndPos = nLen +1;
+String aNewStr( '=' );
+aNewStr.Append( aString );
+aTextWindow.SetTextString( aNewStr );
+break;
+}
+case CELLTYPE_STRING:
+case CELLTYPE_EDIT:
+nStartPos = 0;
+nEndPos = nLen;
+break;
+case CELLTYPE_FORMULA:
+nEndPos = nLen;
+break;
+default:
+aTextWindow.SetTextString( '=' );
+break;
+}
+}
EditView* pView = aTextWindow.GetEditView();
if (pView)
{
-pView->SetSelection( ESelection(0,1, 0,1) );
+pView->SetSelection( ESelection(0, nStartPos, 0, nEndPos)
);
pScMod->InputChanged(pView);
SetOkCancelMode();
pView->SetEditEngineUpdateMode(sal_True);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/doc/doclay.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 235c790fdb04c27487de4510a0d51323f5442e70 Author: Tsutomu Uchino Date: Wed Jan 8 12:38:09 2014 + Resolves: #i51453# avoid relative sizing for the picture and... formula wrapped by inserted frame when caption is added (cherry picked from commit 0681d4e0cd7425349600672964e48a5dbbb3c7db) Change-Id: Ie526391b8676c259a77060dbe04c3e7c8ad499c0 diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx index cb93f96..4b906e8 100644 --- a/sw/source/core/doc/doclay.cxx +++ b/sw/source/core/doc/doclay.cxx @@ -1319,7 +1319,7 @@ lcl_InsertLabel(SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl, pNewSet->Put( SwFmtHoriOrient( 0, text::HoriOrientation::CENTER ) ); aFrmSize = pOldFmt->GetFrmSize(); -aFrmSize.SetWidthPercent( 100 ); +aFrmSize.SetWidthPercent( 0 ); aFrmSize.SetHeightPercent( 255 ); pNewSet->Put( aFrmSize ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/source
framework/source/uielement/uicommanddescription.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 396b3594feb735e1a9cd1564f28340d514f9d925
Author: Tsutomu Uchino
Date: Wed Jan 8 08:36:06 2014 +
Resolves: #i118909# fix empty elements of return value...
in UICategoryDescription::getElementNames
(cherry picked from commit e4eb014761df0bd5c88acbcee1935743cb2a04e0)
Change-Id: Ib5a2e14ecb446c339afe5e53be435478845a4024
diff --git a/framework/source/uielement/uicommanddescription.cxx
b/framework/source/uielement/uicommanddescription.cxx
index fb39ab5..9480d46 100644
--- a/framework/source/uielement/uicommanddescription.cxx
+++ b/framework/source/uielement/uicommanddescription.cxx
@@ -735,7 +735,7 @@ throw (::com::sun::star::uno::RuntimeException)
ModuleToCommandFileMap::const_iterator pIter =
m_aModuleToCommandFileMap.begin();
while ( pIter != m_aModuleToCommandFileMap.end() )
{
-aSeq[n] = pIter->first;
+aSeq[n++] = pIter->first;
++pIter;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/dialog/mgetempl.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 55e5c0faafbc3c4f503722000912ec7a022d98db
Author: Tsutomu Uchino
Date: Wed Jan 8 08:11:15 2014 +
Resolves: #i18109# pre-select the name in new style dialog
(cherry picked from commit 3acdfc0f4c1f30c9030361e51c13d19556ea816f)
Conflicts:
sfx2/source/dialog/mgetempl.cxx
Change-Id: I61faf0195d8ee8976e85bcf1a49561eeebc72b39
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index 5462100..b087613 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -416,6 +416,7 @@ void SfxManageStyleSheetPage::Reset( const SfxItemSet&
/*rAttrSet*/ )
if ( sCmp != aName )
pStyle->SetName( aName );
m_pNameRw->SetText( aName );
+m_pNameRw->SetSelection( Selection( SELECTION_MIN, SELECTION_MAX ) );
if ( m_pFollowLb->IsEnabled() )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - vcl/unx
vcl/unx/gtk/window/gtkframe.cxx |9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 6dfbd90ac73473c73b0d87e253f16c78d09d3608
Author: Tsutomu Uchino
Date: Mon Dec 30 13:13:35 2013 +
#i122950# fix duplicated input when input method convert a character on gtk
environment
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index ef0ce94..d5cb527 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -3553,6 +3553,11 @@ void GtkSalFrame::IMHandler::signalIMCommit(
GtkIMContext* CONTEXT_ARG, gchar* p
{
GTK_YIELD_GRAB();
+bool bWasPreedit =
+(pThis->m_aInputEvent.mpTextAttr != 0) ||
+pThis->m_bPreeditJustChanged;
+pThis->m_bPreeditJustChanged = false;
+
pThis->m_aInputEvent.mnTime = 0;
pThis->m_aInputEvent.mpTextAttr = 0;
pThis->m_aInputEvent.maText = String( pText,
RTL_TEXTENCODING_UTF8 );
@@ -3576,9 +3581,7 @@ void GtkSalFrame::IMHandler::signalIMCommit(
GtkIMContext* CONTEXT_ARG, gchar* p
* or because there never was a preedit.
*/
bool bSingleCommit = false;
-bool bWasPreedit =
-(pThis->m_aInputEvent.mpTextAttr != 0) ||
-pThis->m_bPreeditJustChanged;
+
if( ! bWasPreedit
&& pThis->m_aInputEvent.maText.Len() == 1
&& ! pThis->m_aPrevKeyPresses.empty()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
