[Libreoffice-commits] core.git: configure.ac sc/source
configure.ac| 17 - sc/source/core/opencl/openclwrapper.cxx | 16 sc/source/core/opencl/openclwrapper.hxx | 14 ++ 3 files changed, 30 insertions(+), 17 deletions(-) New commits: commit 46894ec48eb33dc99dab807c9fcaf0caa7c6cd84 Author: Tor Lillqvist Date: Sat Jul 13 22:54:17 2013 +0300 Use CL_MAP_WRITE_INVALIDATE_REGION only if defined (in OpenCL 1.2) Can again turn on OpenCL by default for OS X then, hopefully. Change-Id: Id84b2c17c8431080261be45923d8c153f3822e8b diff --git a/configure.ac b/configure.ac index 6f5fe8dd..cc439e0 100644 --- a/configure.ac +++ b/configure.ac @@ -9811,15 +9811,14 @@ OPENCL_LIBS= OPENCL_CFLAGS= ENABLE_OPENCL= AC_MSG_CHECKING([OpenCL]) -dnl if test \( -z "$with_opencl_sdk" -o "$with_opencl_sdk" = yes \) -a $_os = Darwin; then -dnl# OS X -dnlAC_MSG_RESULT([yes, always on OS X]) -dnlENABLE_OPENCL=TRUE -dnlOPENCL_CFLAGS= -dnlOPENCL_LIBS="-framework OpenCL" -dnlAC_DEFINE(HAVE_FEATURE_OPENCL) -dnl -if test -z "$with_opencl_sdk" -o "$with_opencl_sdk" = no; then +if test \( -z "$with_opencl_sdk" -o "$with_opencl_sdk" = yes \) -a $_os = Darwin; then + # OS X + AC_MSG_RESULT([yes, always on OS X]) + ENABLE_OPENCL=TRUE + OPENCL_CFLAGS= + OPENCL_LIBS="-framework OpenCL" + AC_DEFINE(HAVE_FEATURE_OPENCL) +elif test -z "$with_opencl_sdk" -o "$with_opencl_sdk" = no; then AC_MSG_RESULT([no]) else if test -d "$with_opencl_sdk/include"; then diff --git a/sc/source/core/opencl/openclwrapper.cxx b/sc/source/core/opencl/openclwrapper.cxx index f767479..584d533 100644 --- a/sc/source/core/opencl/openclwrapper.cxx +++ b/sc/source/core/opencl/openclwrapper.cxx @@ -1115,9 +1115,9 @@ int OclCalc::OclHostFormulaAverage(double *srcData,int *start,int *end,double *o cl_mem outputCl = clCreateBuffer(kEnv.mpkContext, (cl_mem_flags) (CL_MEM_READ_WRITE), size* sizeof(float), NULL, &ret); -float * hostMapSrc = (float *)clEnqueueMapBuffer(kEnv.mpkCmdQueue,inputCl,CL_TRUE,CL_MAP_WRITE_INVALIDATE_REGION,0,alignSize * sizeof(float),0,NULL,NULL,NULL); -int * hostMapStart = (int *)clEnqueueMapBuffer(kEnv.mpkCmdQueue,startCl,CL_TRUE,CL_MAP_WRITE_INVALIDATE_REGION,0,size * sizeof(unsigned int),0,NULL,NULL,NULL); -int * hostMapEnd = (int *)clEnqueueMapBuffer(kEnv.mpkCmdQueue,endCl,CL_TRUE,CL_MAP_WRITE_INVALIDATE_REGION,0,size * sizeof(unsigned int),0,NULL,NULL,NULL); +float * hostMapSrc = (float *)clEnqueueMapBuffer(kEnv.mpkCmdQueue,inputCl,CL_TRUE,OPENCLWRAPPER_CL_MAP_WRITE_FLAG,0,alignSize * sizeof(float),0,NULL,NULL,NULL); +int * hostMapStart = (int *)clEnqueueMapBuffer(kEnv.mpkCmdQueue,startCl,CL_TRUE,OPENCLWRAPPER_CL_MAP_WRITE_FLAG,0,size * sizeof(unsigned int),0,NULL,NULL,NULL); +int * hostMapEnd = (int *)clEnqueueMapBuffer(kEnv.mpkCmdQueue,endCl,CL_TRUE,OPENCLWRAPPER_CL_MAP_WRITE_FLAG,0,size * sizeof(unsigned int),0,NULL,NULL,NULL); #if 1 for(int i=0;i #endif +// CL_MAP_WRITE_INVALIDATE_REGION is new in OpenCL 1.2. + +// When compiling against an older OpenCL, use CL_MAP_WRITE. + +// FIXME: But what if this code has been compiled against OpenCL 1.2 +// headers but then runs against an OpenCL 1.1 implementation? +// Probably the code should check at run-time the version of the +// OpenCL implementation and choose which flag to use based on that. +#ifdef CL_MAP_WRITE_INVALIDATE_REGION +#define OPENCLWRAPPER_CL_MAP_WRITE_FLAG CL_MAP_WRITE_INVALIDATE_REGION +#else +#define OPENCLWRAPPER_CL_MAP_WRITE_FLAG CL_MAP_WRITE +#endif + #if defined(_MSC_VER) #ifndef strcasecmp #define strcasecmp strcmp ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Why dev-www.libreoffice.org is unreachable
I just clone the code, when I issue the make command, I got following error: cd /home/kokhoe/workspace/LibreOffice/core/src/tmp && wget --progress=dot:mega -Q 0 -P "." -l 0 -nd -nH -N http://dev-www.libreoffice.org/src/libcdr-0.0.14.tar.bz2 2>&1 | tee -a /home/kokhoe/workspace/LibreOffice/core/src/fetch.log && [ $PIPESTATUS -eq 0 ] && SUM=`md5sum libcdr-0.0.14.tar.bz2 | sed "s/ .*//"` && if test "$SUM" != "d88f9b94df880d2c05be943b000ca112"; then echo ERROR: expected checksum for libcdr-0.0.14.tar.bz2 is d88f9b94df880d2c05be943b000ca112 2>&1 | tee -a /home/kokhoe/workspace/LibreOffice/core/src/fetch.log; false; fi && mv libcdr-0.0.14.tar.bz2 ../ --2013-07-14 10:09:33-- http://dev-www.libreoffice.org/src/libcdr-0.0.14.tar.bz2 Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 32.1.6.124, 2001:67c:2178:7::70 Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|32.1.6.124|:80... failed: Connection timed out. Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|2001:67c:2178:7::70|:80... failed: Network is unreachable. make: *** [/home/kokhoe/workspace/LibreOffice/core/workdir/ unxlngx6.pro/download] Error 1 I did try to manually connect to dev-www.libreoffice.org but failed. I then issue the make command again and this time I got timed out error as shown below: --2013-07-14 10:15:37-- (try: 3) http://dev-www.libreoffice.org/src/libcdr-0.0.14.tar.bz2 Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|32.1.6.124|:80... failed: Connection timed out. Retrying. It seem to me the server is never exist. Please help. THanks @! ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sfx2/source slideshow/source slideshow/test soltools/cpp sw/inc sw/source
sfx2/source/control/unoctitm.cxx |4 +-
slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx |2 -
slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.mm |2 -
slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.cxx |2 -
slideshow/source/engine/attributemap.cxx |4 +-
slideshow/test/demoshow.cxx |4 +-
soltools/cpp/_eval.c |2 -
sw/inc/ccoll.hxx |2 -
sw/inc/numrule.hxx |2 -
sw/source/core/doc/SwStyleNameMapper.cxx |4 +-
sw/source/core/doc/number.cxx|2 -
sw/source/core/fields/expfld.cxx |2 -
sw/source/core/unocore/unosett.cxx | 16
+-
sw/source/filter/html/css1atr.cxx|2 -
sw/source/filter/html/htmlatr.cxx|6 +--
sw/source/filter/html/htmlcss1.cxx | 10
+++---
sw/source/filter/html/htmlgrin.cxx |4 +-
sw/source/filter/ww1/w1filter.cxx|4 +-
sw/source/filter/ww8/rtfattributeoutput.cxx |2 -
sw/source/filter/ww8/styles.cxx |2 -
sw/source/ui/chrdlg/ccoll.cxx|2 -
21 files changed, 40 insertions(+), 40 deletions(-)
New commits:
commit 542b45af44cae091735d9c2e11756a928e230261
Author: Takeshi Abe
Date: Sun Jul 14 08:15:57 2013 +0900
Mark as const
Change-Id: I0bf93f1293fb08b8b558fcac0cb496ed99ad13d9
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 9f30889..8ee5335 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -344,8 +344,8 @@ SfxOfficeDispatch::~SfxOfficeDispatch()
const ::com::sun::star::uno::Sequence< sal_Int8 >&
SfxOfficeDispatch::impl_getStaticIdentifier()
{
// {38 57 CA 80 09 36 11 d4 83 FE 00 50 04 52 6B 21}
-static sal_uInt8 pGUID[16] = { 0x38, 0x57, 0xCA, 0x80, 0x09, 0x36, 0x11,
0xd4, 0x83, 0xFE, 0x00, 0x50, 0x04, 0x52, 0x6B, 0x21 };
-static ::com::sun::star::uno::Sequence< sal_Int8 >
seqID((sal_Int8*)pGUID,16) ;
+static const sal_uInt8 pGUID[16] = { 0x38, 0x57, 0xCA, 0x80, 0x09, 0x36,
0x11, 0xd4, 0x83, 0xFE, 0x00, 0x50, 0x04, 0x52, 0x6B, 0x21 };
+static ::com::sun::star::uno::Sequence< sal_Int8 > seqID((const
sal_Int8*)pGUID,16) ;
return seqID ;
}
diff --git
a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
index 2e1709e..0450f1c 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
@@ -292,7 +292,7 @@ void Iris::display(double nTime, double SlideWidth, double
SlideHeight, double D
void Iris::prepare()
{
-static GLubyte img[3] = { 80, 80, 80 };
+static const GLubyte img[3] = { 80, 80, 80 };
glGenTextures(1, &maTexture);
glBindTexture(GL_TEXTURE_2D, maTexture);
diff --git a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.mm
b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.mm
index a0c195b..72c86ce 100644
--- a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.mm
+++ b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.mm
@@ -284,7 +284,7 @@ void Iris::display(double nTime, double SlideWidth, double
SlideHeight, double D
void Iris::prepare()
{
-static GLubyte img[3] = { 80, 80, 80 };
+static const GLubyte img[3] = { 80, 80, 80 };
glGenTextures(1, &maTexture);
glBindTexture(GL_TEXTURE_2D, maTexture);
diff --git a/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.cxx
b/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.cxx
index f9186bd..08dc6db 100644
--- a/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.cxx
@@ -288,7 +288,7 @@ void Iris::display(double nTime, double SlideWidth, double
SlideHeight, double D
void Iris::prepare()
{
-static GLubyte img[3] = { 80, 80, 80 };
+static const GLubyte img[3] = { 80, 80, 80 };
glGenTextures(1, &maTexture);
glBindTexture(GL_TEXTURE_2D, maTexture);
diff --git a/slideshow/source/engine/attributemap.cxx
b/slideshow/source/engine/attributemap.cxx
index 9bcf37d..1185a89 100644
--- a/slideshow/source/engine/attributemap.cxx
+++ b/slideshow/source/engine/attributemap.cxx
@@ -41,7 +41,7 @@ namespace slideshow
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/dpfilteredcache.hxx |5
sc/source/core/data/dpfilteredcache.cxx | 12 +
sc/source/core/data/dpgroup.cxx | 296 +++-
3 files changed, 197 insertions(+), 116 deletions(-)
New commits:
commit 76488b00ed75bf7915d6d57af9875c6434e740d6
Author: Kohei Yoshida
Date: Sat Jul 13 16:59:16 2013 -0400
fdo#63998: Filtering by page fields to work again.
Change-Id: I267ccb30cfa6347313fa1de96e18731f0e22d57d
diff --git a/sc/inc/dpfilteredcache.hxx b/sc/inc/dpfilteredcache.hxx
index bff1e18..e6c9bd0 100644
--- a/sc/inc/dpfilteredcache.hxx
+++ b/sc/inc/dpfilteredcache.hxx
@@ -56,6 +56,8 @@ public:
/** returns true if the matching condition is met for a single cell
value, or false otherwise. */
virtual bool match( const ScDPItemData& rCellData ) const = 0;
+
+virtual std::vector getMatchValues() const = 0;
};
/** ordinary single-item filter. */
@@ -66,7 +68,7 @@ public:
virtual ~SingleFilter() {}
virtual bool match(const ScDPItemData& rCellData) const;
-
+virtual std::vector getMatchValues() const;
const ScDPItemData& getMatchValue() const;
private:
@@ -82,6 +84,7 @@ public:
GroupFilter();
virtual ~GroupFilter() {}
virtual bool match(const ScDPItemData& rCellData) const;
+virtual std::vector getMatchValues() const;
void addMatchItem(const ScDPItemData& rItem);
size_t getMatchItemCount() const;
diff --git a/sc/source/core/data/dpfilteredcache.cxx
b/sc/source/core/data/dpfilteredcache.cxx
index 51bf571..62c33eb 100644
--- a/sc/source/core/data/dpfilteredcache.cxx
+++ b/sc/source/core/data/dpfilteredcache.cxx
@@ -62,6 +62,13 @@ bool ScDPFilteredCache::SingleFilter::match(const
ScDPItemData& rCellData) const
return maItem == rCellData;
}
+std::vector ScDPFilteredCache::SingleFilter::getMatchValues()
const
+{
+std::vector aValues;
+aValues.push_back(maItem);
+return aValues;
+}
+
const ScDPItemData& ScDPFilteredCache::SingleFilter::getMatchValue() const
{
return maItem;
@@ -83,6 +90,11 @@ bool ScDPFilteredCache::GroupFilter::match(const
ScDPItemData& rCellData) const
return false;
}
+std::vector ScDPFilteredCache::GroupFilter::getMatchValues()
const
+{
+return maItems;
+}
+
void ScDPFilteredCache::GroupFilter::addMatchItem(const ScDPItemData& rItem)
{
maItems.push_back(rItem);
diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx
index 5368523..81920d8 100644
--- a/sc/source/core/data/dpgroup.cxx
+++ b/sc/source/core/data/dpgroup.cxx
@@ -54,41 +54,54 @@ const sal_uInt16 SC_DP_LEAPYEAR = 1648; // arbitrary
leap year for date calc
class ScDPGroupNumFilter : public ScDPFilteredCache::FilterBase
{
public:
-ScDPGroupNumFilter(const ScDPItemData& rValue, const ScDPNumGroupInfo&
rInfo);
+ScDPGroupNumFilter(const std::vector& rValues, const
ScDPNumGroupInfo& rInfo);
virtual ~ScDPGroupNumFilter() {}
virtual bool match(const ScDPItemData &rCellData) const;
+virtual std::vector getMatchValues() const;
private:
-ScDPItemData maValue;
+std::vector maValues;
ScDPNumGroupInfo maNumInfo;
};
-ScDPGroupNumFilter::ScDPGroupNumFilter(const ScDPItemData& rValue, const
ScDPNumGroupInfo& rInfo) :
-maValue(rValue), maNumInfo(rInfo) {}
+ScDPGroupNumFilter::ScDPGroupNumFilter(const std::vector&
rValues, const ScDPNumGroupInfo& rInfo) :
+maValues(rValues), maNumInfo(rInfo) {}
bool ScDPGroupNumFilter::match(const ScDPItemData& rCellData) const
{
if (rCellData.GetType() != ScDPItemData::Value)
return false;
-double fVal = maValue.GetValue();
-if (rtl::math::isInf(fVal))
+std::vector::const_iterator it = maValues.begin(), itEnd =
maValues.end();
+for (; it != itEnd; ++it)
{
-if (rtl::math::isSignBitSet(fVal))
+double fVal = it->GetValue();
+if (rtl::math::isInf(fVal))
{
-// Less than the min value.
-return rCellData.GetValue() < maNumInfo.mfStart;
+if (rtl::math::isSignBitSet(fVal))
+{
+// Less than the min value.
+return rCellData.GetValue() < maNumInfo.mfStart;
+}
+
+// Greater than the max value.
+return maNumInfo.mfEnd < rCellData.GetValue();
}
-// Greater than the max value.
-return maNumInfo.mfEnd < rCellData.GetValue();
+double low = fVal;
+double high = low + maNumInfo.mfStep;
+if (maNumInfo.mbIntegerOnly)
+high += 1.0;
+
+if (low <= rCellData.GetValue() && rCellData.GetValue() < high)
+return true;
}
-double low = fVal;
-double high = low + maNumInfo.mfStep;
-if (maNumInfo.mbIntegerOnly)
-high += 1.0;
+return false;
+}
-return low <= rCellData.GetValue() && rCellData.GetValue() < high;
[Libreoffice-commits] core.git: Branch 'feature/vlc' - avmedia/source
avmedia/source/vlc/vlcplayer.cxx |8 +++-
avmedia/source/vlc/vlcwindow.cxx |2 ++
2 files changed, 9 insertions(+), 1 deletion(-)
New commits:
commit 9303e7460191bf2864c57a8882b64941a3484995
Author: Minh Ngo
Date: Sat Jul 13 23:09:47 2013 +0300
Fixing pausing/stopping media features
Change-Id: I3a1c5201481be819f84e8475719a1ce9f15e20ec
diff --git a/avmedia/source/vlc/vlcplayer.cxx b/avmedia/source/vlc/vlcplayer.cxx
index f62b711..d54cb2c 100644
--- a/avmedia/source/vlc/vlcplayer.cxx
+++ b/avmedia/source/vlc/vlcplayer.cxx
@@ -51,7 +51,7 @@ void SAL_CALL VLCPlayer::start()
void SAL_CALL VLCPlayer::stop()
{
::osl::MutexGuard aGuard(m_aMutex);
-libvlc_media_player_stop( mPlayer.get() );
+libvlc_media_player_pause( mPlayer.get() );
}
::sal_Bool SAL_CALL VLCPlayer::isPlaying()
@@ -69,6 +69,12 @@ double SAL_CALL VLCPlayer::getDuration()
void SAL_CALL VLCPlayer::setMediaTime( double fTime )
{
::osl::MutexGuard aGuard(m_aMutex);
+
+if ( fTime < 0.0001 && !libvlc_media_player_is_playing( mPlayer.get()
) )
+{
+libvlc_media_player_stop( mPlayer.get() );
+}
+
libvlc_media_player_set_time( mPlayer.get(), fTime * MS_IN_SEC );
}
diff --git a/avmedia/source/vlc/vlcwindow.cxx b/avmedia/source/vlc/vlcwindow.cxx
index e61398e..72f0572 100644
--- a/avmedia/source/vlc/vlcwindow.cxx
+++ b/avmedia/source/vlc/vlcwindow.cxx
@@ -1,3 +1,4 @@
+#include
#include "vlcwindow.hxx"
using namespace ::com::sun::star;
@@ -81,6 +82,7 @@ void SAL_CALL VLCWindow::setVisible( sal_Bool Visible )
void SAL_CALL VLCWindow::setEnable( sal_Bool Enable )
throw (uno::RuntimeException)
{
+std::cout << __PRETTY_FUNCTION__ << " " << Enable << std::endl;
}
void SAL_CALL VLCWindow::setFocus()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |3 --- source/text/shared/optionen/01110100.xhp | 11 +-- 2 files changed, 5 insertions(+), 9 deletions(-) New commits: commit 5e64ac33955bdb3e58215ff9dc85f6f310e561c4 Author: Caolán McNamara Date: Sat Jul 13 20:44:09 2013 +0100 update help ids for chart color options page Change-Id: I5d1c9898f6d7fcc93a6afa307166851d653038ae diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 72fab47..d9f4ccf 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -2638,7 +2638,6 @@ HID_OPTCAPTION_PAGE,53229, HID_OPTCOMPATIBILITY_PAGE,53251, HID_OPTCREATEFAX,41150, HID_OPTIONS_ASIAN_LAYOUT,34183, -HID_OPTIONS_CHART_DEFCOLORS,40055, HID_OPTIONS_COLOR,33808, HID_OPTIONS_COLORCONFIG_NAME_SCHEME,39875, HID_OPTIONS_DICT_EDIT,33815, @@ -7195,7 +7194,6 @@ svx_ListBox_OFA_TP_VIEW_LB_MENU_ICONS,810520105, svx_ListBox_OFA_TP_VIEW_LB_MOUSEMIDDLE,810520098, svx_ListBox_OFA_TP_VIEW_LB_MOUSEPOS,810520095, svx_ListBox_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_DCB_EXPAND_KEY,809160323, -svx_ListBox_RID_OPTPAGE_CHART_DEFCOLORS_LB_CHART_COLOR_LIST,705613314, svx_ListBox_RID_SFXDLG_EDITDICT_LB_ALLDICTS,1270418976, svx_ListBox_RID_SFXDLG_EDITDICT_LB_DICTLANG,1270418957, svx_ListBox_RID_SFXDLG_NEWDICT_LB_DICTLANG,1270402573, @@ -7505,7 +7503,6 @@ svx_PushButton_RID_OFAPAGE_AUTOCORR_QUOTE_PB_SGL_STD,808997425, svx_PushButton_RID_OFAPAGE_AUTOCORR_QUOTE_PB_STARTQUOTE,808997389, svx_PushButton_RID_OFAPAGE_AUTOFMT_APPLY_PB_EDIT,809013821, svx_PushButton_RID_OFAPAGE_SMARTTAG_OPTIONS_PB_SMARTTAGS,809259743, -svx_PushButton_RID_OPTPAGE_CHART_DEFCOLORS_PB_RESET_TO_DEFAULT,705614341, svx_PushButton_RID_SFXDLG_EDITDICT_PB_DELETE_REPLACE,1270420008, svx_PushButton_RID_SFXDLG_EDITDICT_PB_NEW_REPLACE,1270420007, svx_PushButton_RID_SFXPAGE_DBREGISTER_BTN_DELETE,809226770, diff --git a/source/text/shared/optionen/01110100.xhp b/source/text/shared/optionen/01110100.xhp index 871db5f..12cb997 100644 --- a/source/text/shared/optionen/01110100.xhp +++ b/source/text/shared/optionen/01110100.xhp @@ -33,19 +33,18 @@ charts; colors colors;charts + Default colors Assigns colors to the data rows. The settings only apply for all newly created charts. - -Chart colors -Displays all the colors available for the data series. Select a data series to change its color. Select the desired color from the adjacent color table. +Chart colors +Displays all the colors available for the data series. Select a data series to change its color. Select the desired color from the adjacent color table. Color table This table is used as a means of replacing the chart colors for the selected data rows. For example, if you selected data row 6 and then click on the color green 8, the old color of the data row is replaced by green 8. The name of the selected color is shown below the color table. - -Default -Restores the color settings that were defined when the program was installed. +Default +Restores the color settings that were defined when the program was installed. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig cui/UIConfig_cui.mk extras/source helpcontent2 svx/source
cui/UIConfig_cui.mk|1
cui/source/inc/helpid.hrc |1
cui/source/options/optchart.cxx| 134 --
cui/source/options/optchart.hrc| 32
cui/source/options/optchart.hxx| 24 ---
cui/source/options/optchart.src| 56 ---
cui/uiconfig/ui/optchartcolorspage.ui | 177 +
cui/uiconfig/ui/querydeletechartcolordialog.ui |2
extras/source/glade/libreoffice-catalog.xml.in |6
helpcontent2 |2
svx/source/dialog/dlgctrl.cxx |8 -
11 files changed, 258 insertions(+), 185 deletions(-)
New commits:
commit d9bfa462ba8dd0a966fe913fad49f300ea48f638
Author: Caolán McNamara
Date: Sat Jul 13 16:02:56 2013 +0100
convert chart color options page to .ui
Change-Id: I9420014d8bee8f71b5ab64aba5dbc7c27f4a25f4
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 4939247..5f51232 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -46,6 +46,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/optappearancepage \
cui/uiconfig/ui/optbrowserpage \
cui/uiconfig/ui/optctlpage \
+ cui/uiconfig/ui/optchartcolorspage \
cui/uiconfig/ui/optemailpage \
cui/uiconfig/ui/optfltrpage \
cui/uiconfig/ui/optfontspage \
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index e896118..280b746 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -27,7 +27,6 @@
#define HID_OPTIONS_LINGU "CUI_HID_OPTIONS_LINGU"
#define HID_OPTIONS_DICT_NEW "CUI_HID_OPTIONS_DICT_NEW"
#define HID_OPTIONS_DICT_EDIT "CUI_HID_OPTIONS_DICT_EDIT"
-#define HID_OPTIONS_CHART_DEFCOLORS "CUI_HID_OPTIONS_CHART_DEFCOLORS"
#define HID_OPTIONS_ASIAN_LAYOUT "CUI_HID_OPTIONS_ASIAN_LAYOUT"
#define HID_CLB_EDIT_MODULES_DICS "CUI_HID_CLB_EDIT_MODULES_DICS"
#define HID_CLB_EDIT_MODULES_MODULES "CUI_HID_CLB_EDIT_MODULES_MODULES"
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index 34e5c1a..5f70a12 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -20,56 +20,47 @@
#include
#include
#include "optchart.hxx"
-#include "optchart.hrc"
#include
#include
#include // for SID_SCH_EDITOPTIONS
-//
-// class ChartColorLB
-//
-void ChartColorLB::FillBox( const SvxChartColorTable & rTab )
+namespace
{
-long nCount = rTab.size();
-SetUpdateMode( sal_False );
-
-for( long i = 0; i < nCount; i++ )
+void FillBoxChartColorLB(ColorLB *pLB, const SvxChartColorTable & rTab)
{
-Append( rTab[ i ] );
+pLB->SetUpdateMode(false);
+pLB->Clear();
+long nCount = rTab.size();
+for(long i = 0; i < nCount; ++i)
+{
+pLB->Append(rTab[i]);
+}
+pLB->SetUpdateMode(true);
}
-SetUpdateMode( sal_True );
}
-
-//
-// class SvxDefaultColorOptPage
-//
-SvxDefaultColorOptPage::SvxDefaultColorOptPage( Window* pParent, const
SfxItemSet& rInAttrs ) :
-
-SfxTabPage( pParent, CUI_RES( RID_OPTPAGE_CHART_DEFCOLORS ), rInAttrs ),
-
-aGbChartColors ( this, CUI_RES( FL_CHART_COLOR_LIST ) ),
-aLbChartColors ( this, CUI_RES( LB_CHART_COLOR_LIST ) ),
-aGbColorBox ( this, CUI_RES( FL_COLOR_BOX ) ),
-aValSetColorBox ( this, CUI_RES( CT_COLOR_BOX ) ),
-aPBDefault ( this, CUI_RES( PB_RESET_TO_DEFAULT ) ),
-aPBAdd ( this, CUI_RES( PB_ADD_CHART_COLOR ) ),
-aPBRemove ( this, CUI_RES( PB_REMOVE_CHART_COLOR ) )
+SvxDefaultColorOptPage::SvxDefaultColorOptPage(Window* pParent, const
SfxItemSet& rInAttrs)
+: SfxTabPage(pParent, "OptChartColorsPage","cui/ui/optchartcolorspage.ui",
rInAttrs)
{
-FreeResource();
-
-aPBDefault.SetClickHdl( LINK( this, SvxDefaultColorOptPage,
ResetToDefaults ) );
-aPBAdd.SetClickHdl( LINK( this, SvxDefaultColorOptPage, AddChartColor ) );
-aPBRemove.SetClickHdl( LINK( this, SvxDefaultColorOptPage,
RemoveChartColor ) );
-aLbChartColors.SetSelectHdl( LINK( this, SvxDefaultColorOptPage,
ListClickedHdl ) );
-aValSetColorBox.SetSelectHdl( LINK( this, SvxDefaultColorOptPage,
BoxClickedHdl ) );
-
-aValSetColorBox.SetStyle( aValSetColorBox.GetStyle()
+get(m_pPBRemove, "delete");
+get(m_pPBAdd, "add");
+get(m_pPBDefault, "default");
+get(m_pValSetColorBox, "table");
+get(m_pLbChartColors, "colors");
+m_pLbChartColors->set_height_request(m_pLbChartColors->GetTextHeight()*16);
+
+m_pPBDefault->SetClickHdl( LINK( this, SvxDefaultColorOptPage,
ResetToDefaults ) );
+m_pPBAdd->SetClickHdl( LINK( this, SvxDefaultColorOptPage, AddChartColor )
);
+m_pPBRemove->SetClickHdl( LINK( this, SvxDefaultColorOptPage,
RemoveChartColor ) );
+m_pLbChartColors->
[Libreoffice-commits] core.git: Branch 'feature/vlc' - avmedia/source
avmedia/source/vlc/vlcframegrabber.cxx |1 +
avmedia/source/vlc/vlcframegrabber.hxx |2 +-
avmedia/source/vlc/vlcplayer.cxx |2 +-
avmedia/source/vlc/vlcwindow.cxx |1 +
4 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit b5f4002ec180c5b1e25d052461700d94fc2ccea1
Author: Minh Ngo
Date: Sat Jul 13 22:31:57 2013 +0300
Fixing default frame size
Change-Id: I82438768a8165f3ce5fdde03e89d2d2c9acc24c6
diff --git a/avmedia/source/vlc/vlcframegrabber.cxx
b/avmedia/source/vlc/vlcframegrabber.cxx
index 5cf76ec..b8abf30 100644
--- a/avmedia/source/vlc/vlcframegrabber.cxx
+++ b/avmedia/source/vlc/vlcframegrabber.cxx
@@ -16,6 +16,7 @@ SAL_CALL VLCFrameGrabber::VLCFrameGrabber()
::uno::Reference< css::graphic::XGraphic > SAL_CALL
VLCFrameGrabber::grabFrame( double fMediaTime )
{
+std::cout << __PRETTY_FUNCTION__ << std::endl;
return ::uno::Reference< css::graphic::XGraphic >();
}
diff --git a/avmedia/source/vlc/vlcframegrabber.hxx
b/avmedia/source/vlc/vlcframegrabber.hxx
index cb77e41..7d4d664 100644
--- a/avmedia/source/vlc/vlcframegrabber.hxx
+++ b/avmedia/source/vlc/vlcframegrabber.hxx
@@ -20,10 +20,10 @@
#ifndef _VLCFRAMEGRABBER_HXX
#define _VLCFRAMEGRABBER_HXX
-#include "vlccommon.hxx"
#include
#include
#include
+#include "vlccommon.hxx"
namespace avmedia {
namespace vlc {
diff --git a/avmedia/source/vlc/vlcplayer.cxx b/avmedia/source/vlc/vlcplayer.cxx
index d94206c..f62b711 100644
--- a/avmedia/source/vlc/vlcplayer.cxx
+++ b/avmedia/source/vlc/vlcplayer.cxx
@@ -119,7 +119,7 @@ void SAL_CALL VLCPlayer::setMute( ::sal_Bool bSet )
css::awt::Size SAL_CALL VLCPlayer::getPreferredPlayerWindowSize()
{
-return css::awt::Size( 1, 1 );
+return css::awt::Size( 480, 360 );
}
namespace
diff --git a/avmedia/source/vlc/vlcwindow.cxx b/avmedia/source/vlc/vlcwindow.cxx
index 19f3791..e61398e 100644
--- a/avmedia/source/vlc/vlcwindow.cxx
+++ b/avmedia/source/vlc/vlcwindow.cxx
@@ -70,6 +70,7 @@ void SAL_CALL VLCWindow::setPosSize( sal_Int32 X, sal_Int32
Y, sal_Int32 Width,
awt::Rectangle SAL_CALL VLCWindow::getPosSize()
throw (uno::RuntimeException)
{
+return awt::Rectangle();
}
void SAL_CALL VLCWindow::setVisible( sal_Bool Visible )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Updates about Enhanced Database Ranges.
Hello mentors, I have many issues to look at concerning export of formatting information. 1. The ScStyleSheet(s) are not exported by LO Calc when xlsx->LO Calc ->new xslx doc is done. this is because through sc/source/filter/excel takes care about importing the style information and creating ScStyleSheet(s) from it; there is no code to export the style sheet data. So I am looking at coding in that so that style information can be saved to excel as well. Currently I am writing skeleton code and just SAL_DEBUGing around to figure things out in the filter/excel area. I am looking at writing data into style.xml of the created xlsx first. Seems no style information is ever written by current code. After data is successfully written into the styles.xml of xlsx I will move on to write in the information, that will be very quick; it's simple. 2. The database ranges created by excel (successfully imported into LO Calc) are not exported to xlsx! Seems there is no code to export the ScDBData objects to xlsx. I would like to achieve this after the style export is done with. This is because the styles thing is more interrelated to different tiny parts of code and will take a lot of time. 3. After the database ranges are successfully exported to xlsx I can work towards including the data in the /tables/table#.xml of the related database range. All these tasks are big ones and once done will help not only alternating database ranges feature but also the export of ranges and style sheets. Please provide me any pointers/ high level flow of this export part while I am investigating it within my little capacity. Please tell me how I must approach stuff and any corrections or suggestions. Thank you guys. On Mon, Jul 8, 2013 at 7:01 PM, Akash Shetye wrote: > Hello, > > Progress so far is. > +finally finished with import of column and row formatting data for tables. > +progressing on exporting back to ooxml. > > Need to code faster since i am behind schedule. But I think I can cope up > well. This week by thursday you should see export feature for ooxml in > place. > On Jun 4, 2013 1:15 AM, "Markus Mohrhard" > wrote: > >> Hey Akash, >> >> 2013/6/2 Akash Shetye : >> > Hey devs, >> > >> > Thank you moggi and kohei for helping me out on the IRC constantly. >> > >> > With the design I am describing now, the feature becomes an n-ternating >> (not >> > alternating) row formatting (not just colouring) feature. Please help >> with >> > your advice and discussions. >> > >> > The feature design can be compartmentalised as follows: >> > 1. The 'Row Formatting definition' part, where used selects the targeted >> > database range and the styles to be applied to it. >> > 2. The 'Row Formatting core' where DB Range code and this feature >> interact. >> > 3. The rendering end. >> >> After reading this I think we need to split the task into smaller and >> easier to handle steps. Hopefully it helps us to focus on the >> important tasks for now. I'll explain some of the problems with your >> proposal below but the general point is that we should work on the >> model right now. Don't think about anything redering related, updating >> references or similar stuff until we have implemented the model and >> maybe have the import and export implemented. The visual >> representation of the feature is something that we can later add but >> is of less importance than you think right now. >> >> > >> > Row Formatting definition: >> > >> > [Data Structures] >> > >> > About the storage of this formatting information and how alternating >> > formatting info will be defined: >> > >> > User defines each alternating format as a band, and as such 'n' number >> of >> > bands constitute particular n-ternating format. The user select the >> > formatting options and the size of the band i.e, how many consecutive >> rows >> > it will cover/applied to. When the user defines another band, the new >> band >> > will follow the previously defined band. Thus we can have more than just >> > alternating colours for our DB ranges. Eg. define first band of size 1 >> and >> > bold text, band 2 of size 3 italic text and band 3 of size 1 underlined >> > text; for a range of 10 rows, the first will be bold followed by 3 >> italic >> > rows followed by 1 underlined row and so on.. >> > >> > Every defined band for an Alternating row format will be stored as a >> > ScDBDataRowFormat that will have the attributes: 1. index number which >> helps >> > define the sequence of these bands 2. band size 3. Formatting >> information >> > (ScStyleSheet instance??). It has its method GetStyle() that returns the >> > style to be applied >> >> Let us limit ourself for now to 2 alternating styles. Extending this >> later is easier than trying to implement everything at once. >> >> > >> > Many such ScDBDataRowFormat instances are added to a container which is >> a >> > part of ScDBDataRowFormatting object. This object represents the total >> style >> > you have created and also conta
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - libvisio/libvisio-0.0.30-msvc.patch.1 libvisio/UnpackedTarball_visio.mk
libvisio/UnpackedTarball_visio.mk |4
libvisio/libvisio-0.0.30-msvc.patch.1 | 12
2 files changed, 16 insertions(+)
New commits:
commit 763b7edb7ac501a93e67e3c679734a74e766c7bf
Author: Fridrich Å trba
Date: Sat Jul 13 08:13:39 2013 +0200
Fix some runtime exceptions with msvc-built libvisio
The previous code was causing silent exceptions in some particular
cases. Passing through a temporary works well.
(cherry picked from commit ae9003af4c3942aa184b67c3cb7687f9dfc7dd5e)
Conflicts:
libvisio/UnpackedTarball_libvisio.mk
Change-Id: I71a9a58b98b5f392da4d8a4c8d08ddc1487ec79f
Reviewed-on: https://gerrit.libreoffice.org/4879
Reviewed-by: Norbert Thiebaud
Tested-by: Norbert Thiebaud
diff --git a/libvisio/UnpackedTarball_visio.mk
b/libvisio/UnpackedTarball_visio.mk
index aa9113b..20ed993 100644
--- a/libvisio/UnpackedTarball_visio.mk
+++ b/libvisio/UnpackedTarball_visio.mk
@@ -11,4 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,visio))
$(eval $(call gb_UnpackedTarball_set_tarball,visio,$(VISIO_TARBALL)))
+$(eval $(call gb_UnpackedTarball_add_patches,visio,\
+ libvisio/libvisio-0.0.30-msvc.patch.1 \
+))
+
# vim: set noet sw=4 ts=4:
diff --git a/libvisio/libvisio-0.0.30-msvc.patch.1
b/libvisio/libvisio-0.0.30-msvc.patch.1
new file mode 100644
index 000..4483806
--- /dev/null
+++ b/libvisio/libvisio-0.0.30-msvc.patch.1
@@ -0,0 +1,12 @@
+--- a/src/lib/VSDContentCollector.cpp
b/src/lib/VSDContentCollector.cpp
+@@ -655,7 +655,8 @@ void libvisio::VSDContentCollector::_flushText()
+ {
+ // Insert duplicate
+ std::vector::iterator charIt = m_charFormats.begin() +
charIndex;
+-m_charFormats.insert(charIt, m_charFormats[charIndex]);
++VSDCharStyle tmpCharFormat = m_charFormats[charIndex];
++m_charFormats.insert(charIt, tmpCharFormat);
+ m_charFormats[charIndex].charCount = paraCharCount;
+ m_charFormats[charIndex+1].charCount -= paraCharCount;
+ }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - libvisio/libvisio-0.0.30-msvc.patch.1 libvisio/UnpackedTarball_libvisio.mk
libvisio/UnpackedTarball_libvisio.mk |4
libvisio/libvisio-0.0.30-msvc.patch.1 | 12
2 files changed, 16 insertions(+)
New commits:
commit 6180917f2d8280f643b14a69abdca79d91820f86
Author: Fridrich Å trba
Date: Sat Jul 13 08:13:39 2013 +0200
Fix some runtime exceptions with msvc-built libvisio
The previous code was causing silent exceptions in some particular
cases. Passing through a temporary works well.
Change-Id: I71a9a58b98b5f392da4d8a4c8d08ddc1487ec79f
(cherry picked from commit ae9003af4c3942aa184b67c3cb7687f9dfc7dd5e)
Reviewed-on: https://gerrit.libreoffice.org/4878
Reviewed-by: Norbert Thiebaud
Tested-by: Norbert Thiebaud
diff --git a/libvisio/UnpackedTarball_libvisio.mk
b/libvisio/UnpackedTarball_libvisio.mk
index e4c0561..8b41f4a 100644
--- a/libvisio/UnpackedTarball_libvisio.mk
+++ b/libvisio/UnpackedTarball_libvisio.mk
@@ -11,4 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libvisio))
$(eval $(call gb_UnpackedTarball_set_tarball,libvisio,$(VISIO_TARBALL)))
+$(eval $(call gb_UnpackedTarball_add_patches,libvisio,\
+ libvisio/libvisio-0.0.30-msvc.patch.1 \
+))
+
# vim: set noet sw=4 ts=4:
diff --git a/libvisio/libvisio-0.0.30-msvc.patch.1
b/libvisio/libvisio-0.0.30-msvc.patch.1
new file mode 100644
index 000..4483806
--- /dev/null
+++ b/libvisio/libvisio-0.0.30-msvc.patch.1
@@ -0,0 +1,12 @@
+--- a/src/lib/VSDContentCollector.cpp
b/src/lib/VSDContentCollector.cpp
+@@ -655,7 +655,8 @@ void libvisio::VSDContentCollector::_flushText()
+ {
+ // Insert duplicate
+ std::vector::iterator charIt = m_charFormats.begin() +
charIndex;
+-m_charFormats.insert(charIt, m_charFormats[charIndex]);
++VSDCharStyle tmpCharFormat = m_charFormats[charIndex];
++m_charFormats.insert(charIt, tmpCharFormat);
+ m_charFormats[charIndex].charCount = paraCharCount;
+ m_charFormats[charIndex+1].charCount -= paraCharCount;
+ }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/table-style' - 2 commits - sw/inc sw/source
Rebased ref, commits from common ancestor:
commit 2a5e7162fa3b916cd1a4925bec8e474896d98739
Author: Alex Ivan
Date: Sat Jul 13 19:41:47 2013 +0300
Modify InsertTable and TableToText methods
The mentioned methods have been modified in order to use the
table style provided as parameter, if present, and the default
frame format if not.
Furthermore, the style is just assigned to the table, rather than
applying the properties immediately. Currently, the style is not
applied, but it will be at render time once the neccesary modifications
are made.
Change-Id: I982ad0539da27e87f3d7443e6a9756503d83be27
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index f8b224f..a24 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -134,77 +134,16 @@ static void lcl_SetDfltBoxAttr( SwFrmFmt& rFmt, sal_uInt8
nId )
rFmt.SetFmtAttr( aBox );
}
-typedef std::map DfltBoxAttrMap_t;
-typedef std::vector DfltBoxAttrList_t;
-
-static void
-lcl_SetDfltBoxAttr(SwTableBox& rBox, DfltBoxAttrList_t & rBoxFmtArr,
-sal_uInt8 const nId, SwTableAutoFmt const*const pAutoFmt = 0)
-{
-DfltBoxAttrMap_t * pMap = rBoxFmtArr[ nId ];
-if (!pMap)
-{
-pMap = new DfltBoxAttrMap_t;
-rBoxFmtArr[ nId ] = pMap;
-}
-
-SwTableBoxFmt* pNewTableBoxFmt = 0;
-SwFrmFmt* pBoxFrmFmt = rBox.GetFrmFmt();
-DfltBoxAttrMap_t::iterator const iter(pMap->find(pBoxFrmFmt));
-if (pMap->end() != iter)
-{
-pNewTableBoxFmt = iter->second;
-}
-else
-{
-SwDoc* pDoc = pBoxFrmFmt->GetDoc();
-// format does not exist, so create it
-pNewTableBoxFmt = pDoc->MakeTableBoxFmt();
-pNewTableBoxFmt->SetFmtAttr( pBoxFrmFmt->GetAttrSet().Get(
RES_FRM_SIZE ) );
-
-if( pAutoFmt )
-pAutoFmt->UpdateToSet( nId,
(SfxItemSet&)pNewTableBoxFmt->GetAttrSet(),
-SwTableAutoFmt::UPDATE_BOX,
-pDoc->GetNumberFormatter( sal_True ) );
-else
-::lcl_SetDfltBoxAttr( *pNewTableBoxFmt, nId );
-
-(*pMap)[pBoxFrmFmt] = pNewTableBoxFmt;
-}
-rBox.ChgFrmFmt( pNewTableBoxFmt );
-}
-
-static SwTableBoxFmt *lcl_CreateDfltBoxFmt( SwDoc &rDoc,
std::vector &rBoxFmtArr,
-sal_uInt16 nCols, sal_uInt8 nId )
-{
-if ( !rBoxFmtArr[nId] )
-{
-SwTableBoxFmt* pBoxFmt = rDoc.MakeTableBoxFmt();
-if( USHRT_MAX != nCols )
-pBoxFmt->SetFmtAttr( SwFmtFrmSize( ATT_VAR_SIZE,
-USHRT_MAX / nCols, 0 ));
-::lcl_SetDfltBoxAttr( *pBoxFmt, nId );
-rBoxFmtArr[ nId ] = pBoxFmt;
-}
-return rBoxFmtArr[nId];
-}
-
-static SwTableBoxFmt *lcl_CreateAFmtBoxFmt( SwDoc &rDoc,
std::vector &rBoxFmtArr,
-const SwTableAutoFmt& rAutoFmt,
-sal_uInt16 nCols, sal_uInt8 nId )
+static void lcl_SetDfltBorders( SwTableFmt* pFmt )
{
-if( !rBoxFmtArr[nId] )
+for( sal_uInt8 n = 0; n < 4; ++n )
{
-SwTableBoxFmt* pBoxFmt = rDoc.MakeTableBoxFmt();
-rAutoFmt.UpdateToSet( nId, (SfxItemSet&)pBoxFmt->GetAttrSet(),
-SwTableAutoFmt::UPDATE_BOX,
-rDoc.GetNumberFormatter( sal_True ) );
-if( USHRT_MAX != nCols )
-pBoxFmt->SetFmtAttr( SwFmtFrmSize( ATT_VAR_SIZE,
-USHRT_MAX / nCols, 0 ));
-rBoxFmtArr[ nId ] = pBoxFmt;
+for( sal_uInt8 i = 0; i < 4; i++ )
+{
+sal_uInt8 nId = (i < 3 ? 0 : 1) + (n ? 2 : 0);
+::lcl_SetDfltBoxAttr( *pFmt->GetBoxFmt( 4 * n + i ), nId );
+}
}
-return rBoxFmtArr[nId];
}
SwTableNode* SwDoc::IsIdxInTbl(const SwNodeIndex& rIdx)
@@ -390,7 +329,8 @@ const SwTable* SwDoc::InsertTable( const
SwInsertTableOptions& rInsTblOpts,
// Create the Box/Line/Table construct
SwTableLineFmt* pLineFmt = MakeTableLineFmt();
-SwTableFmt* pTableFmt = MakeTblFrmFmt( aTblName, GetDfltFrmFmt() );
+SwTableFmt* pTableFmt = pTAFmt ? pTAFmt->GetTableStyle()
+: MakeTblFrmFmt( aTblName, GetDfltFrmFmt() );
/* If the node to insert the table at is a context node and has a
non-default FRAMEDIR propagate it to the table. */
@@ -409,7 +349,11 @@ const SwTable* SwDoc::InsertTable( const
SwInsertTableOptions& rInsTblOpts,
// Set Orientation at the Table's Fmt
pTableFmt->SetFmtAttr( SwFmtHoriOrient( 0, eAdjust ) );
// All lines use the left-to-right Fill-Order!
-pLineFmt->SetFmtAttr( SwFmtFillOrder( ATT_LEFT_TO_RIGHT ));
+pLineFmt->SetFmtAttr( SwFmtFillOrder( ATT_LEFT_TO_RIGHT ) );
+pTableFmt->GetFirstLineFmt()->SetFmtAttr( SwFmtFillOrder(
ATT_LEFT_TO_RIGHT ) );
+pTableFmt->GetOddLineFmt()->SetFmtAttr( SwFmtFillO
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - drawinglayer/source include/drawinglayer
drawinglayer/source/processor2d/vclpixelprocessor2d.cxx | 20 ---
include/drawinglayer/processor2d/vclpixelprocessor2d.hxx |5 +++
2 files changed, 21 insertions(+), 4 deletions(-)
New commits:
commit 56ed1221d4d578260d9e20715d073b70a099efa4
Author: Michael Stahl
Date: Fri Jul 12 19:04:21 2013 +0200
fdo#66745: drawinglayer: properly restore anti-aliasing mode
VclPixelProcessor2D: the constructor changes the anti-aliasing mode of
the given output device, and the destructor restores a hard-coded mode
instead of what was there before.
Due to this commit 5913506b2193e93ca2767ab7365ab2e76ed7848f turned off
anti-aliasing for FontWork objects simply by creating a
temporary VclPixelProcessor2D.
Change-Id: I7f7fcbf86b0dd425f599cd8e62fce3c69a2744bb
(cherry picked from commit 420aa16af0bbab4bdef80ceeb8d44cabe65840e0)
Reviewed-on: https://gerrit.libreoffice.org/4872
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
index dde9bb5..a626d60 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
@@ -62,8 +62,18 @@ namespace drawinglayer
{
namespace processor2d
{
+struct VclPixelProcessor2D::Impl
+{
+sal_uInt16 m_nOrigAntiAliasing;
+
+explicit Impl(OutputDevice const& rOutDev)
+: m_nOrigAntiAliasing(rOutDev.GetAntialiasing())
+{ }
+};
+
VclPixelProcessor2D::VclPixelProcessor2D(const
geometry::ViewInformation2D& rViewInformation, OutputDevice& rOutDev)
-: VclProcessor2D(rViewInformation, rOutDev)
+: VclProcessor2D(rViewInformation, rOutDev)
+, m_pImpl(new Impl(rOutDev))
{
// prepare maCurrentTransformation matrix with viewTransformation
to target directly to pixels
maCurrentTransformation =
rViewInformation.getObjectToViewTransformation();
@@ -75,11 +85,13 @@ namespace drawinglayer
// react on AntiAliasing settings
if(getOptionsDrawinglayer().IsAntiAliasing())
{
-
mpOutputDevice->SetAntialiasing(mpOutputDevice->GetAntialiasing() |
ANTIALIASING_ENABLE_B2DDRAW);
+mpOutputDevice->SetAntialiasing(
+ m_pImpl->m_nOrigAntiAliasing | ANTIALIASING_ENABLE_B2DDRAW);
}
else
{
-
mpOutputDevice->SetAntialiasing(mpOutputDevice->GetAntialiasing() &
~ANTIALIASING_ENABLE_B2DDRAW);
+mpOutputDevice->SetAntialiasing(
+ m_pImpl->m_nOrigAntiAliasing &
~ANTIALIASING_ENABLE_B2DDRAW);
}
}
@@ -89,7 +101,7 @@ namespace drawinglayer
mpOutputDevice->Pop();
// restore AntiAliasing
-mpOutputDevice->SetAntialiasing(mpOutputDevice->GetAntialiasing()
& ~ANTIALIASING_ENABLE_B2DDRAW);
+mpOutputDevice->SetAntialiasing(m_pImpl->m_nOrigAntiAliasing);
}
void VclPixelProcessor2D::processBasePrimitive2D(const
primitive2d::BasePrimitive2D& rCandidate)
diff --git a/include/drawinglayer/processor2d/vclpixelprocessor2d.hxx
b/include/drawinglayer/processor2d/vclpixelprocessor2d.hxx
index c3003f0..f280da7 100644
--- a/include/drawinglayer/processor2d/vclpixelprocessor2d.hxx
+++ b/include/drawinglayer/processor2d/vclpixelprocessor2d.hxx
@@ -25,6 +25,8 @@
#include
#include
+#include
+
//
namespace drawinglayer
@@ -40,6 +42,9 @@ namespace drawinglayer
class DRAWINGLAYER_DLLPUBLIC VclPixelProcessor2D : public
VclProcessor2D
{
private:
+struct Impl;
+boost::scoped_ptr m_pImpl;
+
protected:
/* the local processor for BasePrinitive2D-Implementation based
primitives,
called from the common process()-implementation
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - scripting/source
scripting/source/pyprov/mailmerge.py |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 820fe067c0ede36f357fb214d0298e3caaff512f
Author: Caolán McNamara
Date: Sat Jul 13 15:56:41 2013 +0100
Resolves: fdo#66761 Macro controlled Python Mailmerge broken
Change-Id: Id8bbf06a5571534aa5eef8624e89565fe3715938
(cherry picked from commit c4aa13c931da11164835a7aafbfd7e44bd5714ca)
Reviewed-on: https://gerrit.libreoffice.org/4883
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/scripting/source/pyprov/mailmerge.py
b/scripting/source/pyprov/mailmerge.py
index f70f034..af10dbe 100755
--- a/scripting/source/pyprov/mailmerge.py
+++ b/scripting/source/pyprov/mailmerge.py
@@ -181,7 +181,10 @@ class PyMailSMTPService(unohelper.Base, XSmtpService):
textmsg['Content-Type'] = mimeEncoding
textmsg['MIME-Version'] = '1.0'
- textbody = textbody.encode('utf-8')
+ try:
+ textbody =
textbody.encode('utf-8')
+ except:
+ textbody =
str(textbody.value).encode('utf-8')
if sys.version >= '3':
#http://stackoverflow.com/questions/9403265/how-do-i-use-python-3-2-email-module-to-send-unicode-messages-encoded-in-utf-8-w
textbody =
textbody.decode('iso8859-1')
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - scripting/source
scripting/source/pyprov/mailmerge.py |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 955b20d81affb9082f97e0726625c40ce9f38866
Author: Caolán McNamara
Date: Sat Jul 13 15:56:41 2013 +0100
Resolves: fdo#66761 Macro controlled Python Mailmerge broken
Change-Id: Id8bbf06a5571534aa5eef8624e89565fe3715938
(cherry picked from commit c4aa13c931da11164835a7aafbfd7e44bd5714ca)
Reviewed-on: https://gerrit.libreoffice.org/4884
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/scripting/source/pyprov/mailmerge.py
b/scripting/source/pyprov/mailmerge.py
index f70f034..af10dbe 100755
--- a/scripting/source/pyprov/mailmerge.py
+++ b/scripting/source/pyprov/mailmerge.py
@@ -181,7 +181,10 @@ class PyMailSMTPService(unohelper.Base, XSmtpService):
textmsg['Content-Type'] = mimeEncoding
textmsg['MIME-Version'] = '1.0'
- textbody = textbody.encode('utf-8')
+ try:
+ textbody =
textbody.encode('utf-8')
+ except:
+ textbody =
str(textbody.value).encode('utf-8')
if sys.version >= '3':
#http://stackoverflow.com/questions/9403265/how-do-i-use-python-3-2-email-module-to-send-unicode-messages-encoded-in-utf-8-w
textbody =
textbody.decode('iso8859-1')
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [GSoC] Impress Remote Protocol
Hello Artur, No worry about that ^^ I was just thinking of implementing them so that I can see my pointer actually flying on the big screen :-P. However, do let me know the what protocol you will adopt for this functionality and post it on your wiki page so that I can make the client conform to your design. (x, y in percentage relative to the width and height of the screen? And we take the left upper corner as the origin (0,0)? ) Otherwise, here are several functionalities that I'm looking to implement: 1. The pointer feature support 2. Is it possible to send to client some basic informations like the current presentation filename, author, etc before the users hit "start presentation"? Since (as Michael Meeks pointed out) it's much harder to send previews before the beginning of the presentation, this would be a great alternative solution. I will leave the protocol improvements to you then, but do send me a message over IRC or by email should you need someone to work on that with you. I will keep you updated should I need some further server-end features. ATB and happy coding! Cheers, Siqi 2013/7/13 Artur Dryomov > Hey Siqi, > > Your progress is huge, you are working pretty fast ;-) > > I haven’t worked on the server-side unfortunately. My plan was to > implement the redesign of the client and then to work on the server. The > idea was about implementing things with the current version of the protocol > and only then move forward. That strategy gave me a better understanding of > how the protocol works actually. > > The work on the client is going not so fast as I expected — most of the > work is done and I hope to finish it soon, but a lot of time gone for > debugging and optimizing. > > Protocol-related changes are part of my proposal actually. I have fears > that if you’ll implement them I can fail the GSoC. Can you spend some more > time on polishing, posting screenshots to the ux-advise list, QA, > implementing iPad version, planning the Bonjour support? The design for the > iOS 7 would be great as well — it is possibly coming this fall ;-) I’ll > speed up and try to finish the redesign as fast as possible. Sorry for > slowing things down — I just want to finish the GSoC successfully as much > as you are ;-) > > What do you think? > > Regards, > Artur. -- Cordialement, Siqi LIU Étudiant Ingérieur, Université de Technologie de Compiègne Vice-Président de l'association robotique UTCoupe Responsable d'atelier de ClubChine -- Tel. +33 7 61 16 95 83 email: m...@siqi.fr -- ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: scripting/source
scripting/source/pyprov/mailmerge.py |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit c4aa13c931da11164835a7aafbfd7e44bd5714ca
Author: Caolán McNamara
Date: Sat Jul 13 15:56:41 2013 +0100
Resolves: fdo#66761 Macro controlled Python Mailmerge broken
Change-Id: Id8bbf06a5571534aa5eef8624e89565fe3715938
diff --git a/scripting/source/pyprov/mailmerge.py
b/scripting/source/pyprov/mailmerge.py
index cbd1428..6fa486d 100755
--- a/scripting/source/pyprov/mailmerge.py
+++ b/scripting/source/pyprov/mailmerge.py
@@ -182,7 +182,10 @@ class PyMailSMTPService(unohelper.Base, XSmtpService):
textmsg['Content-Type'] = mimeEncoding
textmsg['MIME-Version'] = '1.0'
- textbody = textbody.encode('utf-8')
+ try:
+ textbody =
textbody.encode('utf-8')
+ except:
+ textbody =
str(textbody.value).encode('utf-8')
if sys.version >= '3':
#http://stackoverflow.com/questions/9403265/how-do-i-use-python-3-2-email-module-to-send-unicode-messages-encoded-in-utf-8-w
textbody =
textbody.decode('iso8859-1')
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/viscrs.hxx | 12 ++---
sw/source/core/crsr/viscrs.cxx | 92 -
2 files changed, 52 insertions(+), 52 deletions(-)
New commits:
commit df4f9dedaa4c4cba0d78bfb935a58b98faa4f553
Author: Miklos Vajna
Date: Sat Jul 13 16:08:01 2013 +0200
SwVisCrsr: rename member variables missing their prefixes
Change-Id: I3c879f282fbe4082a5af6340bb4f2c1452b1b59f
diff --git a/sw/inc/viscrs.hxx b/sw/inc/viscrs.hxx
index 7034593..a38fc3e 100644
--- a/sw/inc/viscrs.hxx
+++ b/sw/inc/viscrs.hxx
@@ -34,11 +34,11 @@ class SwVisCrsr
friend void _InitCore();
friend void _FinitCore();
-bool bIsVisible : 1;
-bool bIsDragCrsr : 1;
+bool m_bIsVisible;
+bool m_bIsDragCrsr;
-Cursor aTxtCrsr;
-const SwCrsrShell* pCrsrShell;
+Cursor m_aTxtCrsr;
+const SwCrsrShell* m_pCrsrShell;
void _SetPosAndShow();
@@ -49,8 +49,8 @@ public:
void Show();
void Hide();
-bool IsVisible() const { return bIsVisible; }
-void SetDragCrsr( bool bFlag = true ) { bIsDragCrsr = bFlag; }
+bool IsVisible() const { return m_bIsVisible; }
+void SetDragCrsr( bool bFlag = true ) { m_bIsDragCrsr = bFlag; }
};
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index dc52c9b..0dd5300 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -55,22 +55,22 @@ MapMode* SwSelPaintRects::pMapMode = 0;
// - Starting from here: classes / methods for the non-text-cursor -
SwVisCrsr::SwVisCrsr( const SwCrsrShell * pCShell )
-: pCrsrShell( pCShell )
+: m_pCrsrShell( pCShell )
{
-pCShell->GetWin()->SetCursor( &aTxtCrsr );
-bIsVisible = aTxtCrsr.IsVisible();
-bIsDragCrsr = false;
-aTxtCrsr.SetWidth( 0 );
+pCShell->GetWin()->SetCursor( &m_aTxtCrsr );
+m_bIsVisible = m_aTxtCrsr.IsVisible();
+m_bIsDragCrsr = false;
+m_aTxtCrsr.SetWidth( 0 );
}
SwVisCrsr::~SwVisCrsr()
{
-if( bIsVisible && aTxtCrsr.IsVisible() )
-aTxtCrsr.Hide();
+if( m_bIsVisible && m_aTxtCrsr.IsVisible() )
+m_aTxtCrsr.Hide();
-pCrsrShell->GetWin()->SetCursor( 0 );
+m_pCrsrShell->GetWin()->SetCursor( 0 );
}
@@ -78,12 +78,12 @@ SwVisCrsr::~SwVisCrsr()
void SwVisCrsr::Show()
{
-if( !bIsVisible )
+if( !m_bIsVisible )
{
-bIsVisible = true;
+m_bIsVisible = true;
// display at all?
-if( pCrsrShell->VisArea().IsOver( pCrsrShell->m_aCharRect ) )
+if( m_pCrsrShell->VisArea().IsOver( m_pCrsrShell->m_aCharRect ) )
_SetPosAndShow();
}
}
@@ -92,55 +92,55 @@ void SwVisCrsr::Show()
void SwVisCrsr::Hide()
{
-if( bIsVisible )
+if( m_bIsVisible )
{
-bIsVisible = false;
+m_bIsVisible = false;
-if( aTxtCrsr.IsVisible() ) // Shouldn't the flags be in effect?
-aTxtCrsr.Hide();
+if( m_aTxtCrsr.IsVisible() ) // Shouldn't the flags be in effect?
+m_aTxtCrsr.Hide();
}
}
void SwVisCrsr::_SetPosAndShow()
{
SwRect aRect;
-long nTmpY = pCrsrShell->m_aCrsrHeight.getY();
+long nTmpY = m_pCrsrShell->m_aCrsrHeight.getY();
if( 0 > nTmpY )
{
nTmpY = -nTmpY;
-aTxtCrsr.SetOrientation( 900 );
-aRect = SwRect( pCrsrShell->m_aCharRect.Pos(),
- Size( pCrsrShell->m_aCharRect.Height(), nTmpY ) );
-aRect.Pos().setX(aRect.Pos().getX() +
pCrsrShell->m_aCrsrHeight.getX());
-if( pCrsrShell->IsOverwriteCrsr() )
+m_aTxtCrsr.SetOrientation( 900 );
+aRect = SwRect( m_pCrsrShell->m_aCharRect.Pos(),
+ Size( m_pCrsrShell->m_aCharRect.Height(), nTmpY ) );
+aRect.Pos().setX(aRect.Pos().getX() +
m_pCrsrShell->m_aCrsrHeight.getX());
+if( m_pCrsrShell->IsOverwriteCrsr() )
aRect.Pos().setY(aRect.Pos().getY() + aRect.Width());
}
else
{
-aTxtCrsr.SetOrientation( 0 );
-aRect = SwRect( pCrsrShell->m_aCharRect.Pos(),
- Size( pCrsrShell->m_aCharRect.Width(), nTmpY ) );
-aRect.Pos().setY(aRect.Pos().getY() +
pCrsrShell->m_aCrsrHeight.getX());
+m_aTxtCrsr.SetOrientation( 0 );
+aRect = SwRect( m_pCrsrShell->m_aCharRect.Pos(),
+ Size( m_pCrsrShell->m_aCharRect.Width(), nTmpY ) );
+aRect.Pos().setY(aRect.Pos().getY() +
m_pCrsrShell->m_aCrsrHeight.getX());
}
// check if cursor should show the current cursor bidi level
-aTxtCrsr.SetDirection( CURSOR_DIRECTION_NONE );
-const SwCursor* pTmpCrsr = pCrsrShell->_GetCrsr();
+m_aTxtCrsr.SetDirection( CURSOR_DIRECTION_NONE );
+const SwCursor* pTmpCrsr = m_pCrsrShell->_GetCrsr();
-if ( pTmpCrsr && !pCrsrShell->IsOverwriteCrsr() )
+if ( pTmpCrsr && !m_pCrsrShell->IsOverwriteCrsr() )
{
SwNode& rNode = pTmpCrsr->GetPoint()->nNode.GetNode();
if( rNode.IsTxtNode() )
{
const SwTxtNode
[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig cui/UIConfig_cui.mk
cui/UIConfig_cui.mk|1
cui/source/inc/cuires.hrc |1
cui/source/options/optchart.cxx| 10 +++
cui/source/options/optchart.src|7 -
cui/uiconfig/ui/colorpage.ui |8 ++---
cui/uiconfig/ui/querydeletechartcolordialog.ui | 35 +
6 files changed, 46 insertions(+), 16 deletions(-)
New commits:
commit d2118b08463e60b96244165f4671a7249e06efff
Author: Caolán McNamara
Date: Sat Jul 13 14:01:18 2013 +0100
convert chart color QueryBox to .ui
Change-Id: Idc514afb9b4e5e2404500d3ad81a4e4203600218
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index e0cff23..4939247 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -72,6 +72,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/picknumberingpage \
cui/uiconfig/ui/pickoutlinepage \
cui/uiconfig/ui/positionpage \
+ cui/uiconfig/ui/querydeletechartcolordialog \
cui/uiconfig/ui/scriptorganizer \
cui/uiconfig/ui/securityoptionsdialog \
cui/uiconfig/ui/select_persona_dialog \
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index 16b6ce5..a79c503 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -158,7 +158,6 @@
#define RID_SVXPAGE_ACCESSIBILITYCONFIG (RID_SVX_START + 250)
#define RID_SVXPAGE_ASIAN_LAYOUT(RID_SVX_START + 246)
#define RID_OPTPAGE_CHART_DEFCOLORS (RID_SVX_START + 299)
-#define RID_OPTQB_COLOR_CHART_DELETE(RID_SVX_START + 296)
#define RID_OPTSTR_COLOR_CHART_DELETE (RID_SVX_START + 289)
#define RID_SVXPAGE_PERSONALIZATION (RID_SVX_START + 247)
#define RID_SVXPAGE_COLORCONFIG (RID_SVX_START + 249)
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index cf7d025..34e5c1a 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -227,11 +227,11 @@ IMPL_LINK( SvxDefaultColorOptPage, RemoveChartColor,
PushButton*, pButton )
if( pColorConfig )
{
OSL_ENSURE(pColorConfig->GetColorList().size() > 1, "don't delete the
last chart color");
-QueryBox aQuery(pButton, CUI_RES(RID_OPTQB_COLOR_CHART_DELETE));
-aQuery.SetText(String(CUI_RES(RID_OPTSTR_COLOR_CHART_DELETE)));
-if(RET_YES == aQuery.Execute())
-{
+MessageDialog aQuery(pButton, "QueryDeleteChartColorDialog",
+"cui/ui/querydeletechartcolordialog.ui");
+if (RET_YES == aQuery.Execute())
+{
pColorConfig->GetColorList().remove( nIndex );
aLbChartColors.Clear();
@@ -244,7 +244,7 @@ IMPL_LINK( SvxDefaultColorOptPage, RemoveChartColor,
PushButton*, pButton )
else if (aLbChartColors.GetEntryCount() > 0)
aLbChartColors.SelectEntryPos( nIndex );
else
-aPBRemove.Enable( sal_False );
+aPBRemove.Enable(true);
}
}
diff --git a/cui/source/options/optchart.src b/cui/source/options/optchart.src
index 3034b13..1653216 100644
--- a/cui/source/options/optchart.src
+++ b/cui/source/options/optchart.src
@@ -84,12 +84,7 @@ String RID_SVXSTR_DIAGRAM_ROW
Text [ en-US ] = "Data Series $(ROW)" ;
};
-QueryBox RID_OPTQB_COLOR_CHART_DELETE
-{
-Buttons = WB_YES_NO ;
-DefButton = WB_DEF_NO ;
-Message [ en-US ] = "Do you really want to delete the chart color?" ;
-};
+
String RID_OPTSTR_COLOR_CHART_DELETE
{
Text [ en-US ] = "Chart Color Deletion" ;
diff --git a/cui/uiconfig/ui/querydeletechartcolordialog.ui
b/cui/uiconfig/ui/querydeletechartcolordialog.ui
new file mode 100644
index 000..1492ad0
--- /dev/null
+++ b/cui/uiconfig/ui/querydeletechartcolordialog.ui
@@ -0,0 +1,35 @@
+
+
+
+
+False
+12
+Show changes?
+False
+dialog
+True
+warning
+yes-no
+Do you really want to delete the
chart color?
+This action cannot be
undone.
+
+
+False
+vertical
+24
+
+
+False
+end
+
+
+False
+True
+end
+0
+
+
+
+
+
+
commit 04f6d24a0a072dc8f1298b34bd2c473b5f0f961e
Author: Caolán McNamara
Date: Sat Jul 13 13:42:42 2013 +0100
.ui parser glitch
Change-Id: I0ec484c230ecddf29d09b13f78af724f27657913
diff --git a/cui/uiconfig/ui/colorpage.ui b/cui/uiconfig/ui/colorpage.ui
index 3481d58..6c58d05 100644
--- a/cui/uiconfig/ui/colorpage.ui
+++ b/cui/uiconfig/ui/colorpage.ui
@@ -205,15 +205,15 @@
end
0
1
+
+ RGB
+ CMYK
+
Color Mode
[Libreoffice-commits] core.git: Branch 'feature/cmis' - sfx2/source
sfx2/source/dialog/dinfdlg.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4844a020da357eacb15831bf3cd7e095b06bb960 Author: Cao Cuong Ngo Date: Sat Jul 13 15:01:02 2013 +0200 Cmis properties dialog when value is empty, set to String type Change-Id: Ic9cabfa6437342ff8962e9d758e745d802e8f73b diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index a79f5f0..a508577 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -2534,7 +2534,7 @@ void CmisPropertiesWindow::AddLine( const OUString& sId, const OUString& sName, SvtSysLocale aSysLocale; const LocaleDataWrapper& rLocaleWrapper = aSysLocale.GetLocaleData(); pNewLine->m_aName.SetText( sName ); -OUString sType = CMIS_TYPE_ANY; +OUString sType = CMIS_TYPE_STRING; OUString sValue; if ( rAny >>= nTmpValue ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: i18nlangtag/source
i18nlangtag/source/isolang/inunx.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 7c52d0d0a48611e571c4d7f85a71fbe81e711655
Author: Eike Rathke
Date: Sat Jul 13 12:12:42 2013 +0200
grml.. Mac
Change-Id: Ia49d45a896a3ea5d180d98c3579fb93c6d4b9911
diff --git a/i18nlangtag/source/isolang/inunx.cxx
b/i18nlangtag/source/isolang/inunx.cxx
index 9e30a8f..a20a64d 100644
--- a/i18nlangtag/source/isolang/inunx.cxx
+++ b/i18nlangtag/source/isolang/inunx.cxx
@@ -99,7 +99,7 @@ static void getPlatformSystemLanguageImpl( LanguageType&
rSystemLanguage,
if ( osl_getProcessLocale(&procLocale) == osl_Process_E_None )
{
-nLang = LanguageTag::convertToLanguageType( *procLocale );
+nLang = LanguageTag( *procLocale ).getLanguageType();
OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER();
rSystemLanguage = nLang;
#ifdef DEBUG
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[BUG] On shadow textbox frame
Hello, When I have a text box with shadow on the side, if the background of the frame is transparent (more than 0%) the shadow come to the foreground. Con you tell me if this a bug ? If so where can I resolve it? If this a UI bug? Thanks for your answers. Matt This message contains information that may be privileged or confidential and is the property of the Capgemini Group. It is intended only for the person to whom it is addressed. If you are not the intended recipient, you are not authorized to read, print, retain, copy, disseminate, distribute, or use this message or any part thereof. If you receive this message in error, please notify the sender immediately and delete all copies of this message. 5pourcent.odt Description: 5pourcent.odt ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/core/text/txtio.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ec07170735331cb64f2e967682ad74def733a931
Author: Caolán McNamara
Date: Sat Jul 13 09:06:06 2013 +0100
make highest debugging level build again
Change-Id: I02dd6d36491321a4210a27605476f1c385f9baba
diff --git a/sw/source/core/text/txtio.cxx b/sw/source/core/text/txtio.cxx
index 5c17981..4de7e4e 100644
--- a/sw/source/core/text/txtio.cxx
+++ b/sw/source/core/text/txtio.cxx
@@ -636,7 +636,7 @@ SvStream &SwDropPortion::operator<<( SvStream &rOs ) const
//$ ostream
{
rOs << " H:" << nDropHeight;
rOs << " L:" << nLines;
-rOs <<" Fnt:" << pPart->GetFont().GetHeight();
+rOs << " Fnt:" << static_cast(pPart->GetFont().GetHeight());
if( nX || nY )
rOs << " [" << nX << '/' << nY << ']';
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/inc vcl/win
vcl/inc/win/saldata.hxx|2 +-
vcl/win/source/app/saldata.cxx |5 +++--
vcl/win/source/gdi/salprn.cxx |2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
New commits:
commit 6089121ebd075bb6422d33d6bff69dff2e88efb2
Author: Michael Stahl
Date: Fri Jul 12 23:13:10 2013 +0200
fdo#66811: vcl: fix broken OUString with length STRING_LEN
ImplSalGetUniString was wrongly converted and constructs OUString with
invalid length in WinSalGraphics::CreateFontSubset; this is then
implicitly converted to an empty UniString so the font names are
missing in the PDF files generated on Windows.
(regression from 9e310cc32923ceb4b18d97ce68d54a339b935f01)
Change-Id: I1603e62cf18f353f3d7de322b9111a173dc6b225
(cherry picked from commit 82f742f65d35896c69be38fa3b1c78a6f71c)
Reviewed-on: https://gerrit.libreoffice.org/4875
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx
index 4361448..fdf2faf 100644
--- a/vcl/inc/win/saldata.hxx
+++ b/vcl/inc/win/saldata.hxx
@@ -196,7 +196,7 @@ void ImplSalPostDispatchMsg( MSG* pMsg, LRESULT
nDispatchResult );
void ImplSalLogFontToFontW( HDC hDC, const LOGFONTW& rLogFont, Font& rFont );
rtl_TextEncoding ImplSalGetSystemEncoding();
-OUString ImplSalGetUniString( const sal_Char* pStr, xub_StrLen nLen =
STRING_LEN );
+OUString ImplSalGetUniString(const sal_Char* pStr, sal_Int32 nLen = -1);
int ImplSalWICompareAscii( const wchar_t* pStr1, const char* pStr2 );
#define SAL_FRAME_WNDEXTRA sizeof( DWORD )
diff --git a/vcl/win/source/app/saldata.cxx b/vcl/win/source/app/saldata.cxx
index 2a3ea09..fc99674 100644
--- a/vcl/win/source/app/saldata.cxx
+++ b/vcl/win/source/app/saldata.cxx
@@ -44,9 +44,10 @@ rtl_TextEncoding ImplSalGetSystemEncoding()
// ---
-OUString ImplSalGetUniString( const sal_Char* pStr, xub_StrLen nLen )
+OUString ImplSalGetUniString(const sal_Char* pStr, sal_Int32 const nLen)
{
-return OUString( pStr, nLen, ImplSalGetSystemEncoding(),
+return OUString( pStr, (-1 == nLen) ? strlen(pStr) : nLen,
+ ImplSalGetSystemEncoding(),
RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_DEFAULT |
RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_DEFAULT |
RTL_TEXTTOUNICODE_FLAGS_INVALID_DEFAULT );
diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx
index 113fb18..94af77c 100644
--- a/vcl/win/source/gdi/salprn.cxx
+++ b/vcl/win/source/gdi/salprn.cxx
@@ -266,7 +266,7 @@ OUString WinSalInstance::GetDefaultPrinter()
char* pTmp = pBuf;
while ( *pTmp && (*pTmp != ',') )
pTmp++;
-return ImplSalGetUniString( pBuf, (xub_StrLen)(pTmp-pBuf) );
+return ImplSalGetUniString( pBuf, static_cast(pTmp-pBuf) );
}
else
return OUString();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[GSoC] Improve Toolbars: Weekly Updates
Hi, The work this week also continued with the conversion of sidebar panels to .ui. One more panel [LinePropertyPanel] after conversion to .ui got pushed. With time moving ahead, I found the difficulty level of the codes (while conversion to .ui) that I faced increased gradually with subsequent panels. Currently three patches [1], [2], [3] are still open and they'll be pushed after getting perfect next week. For the past week, since Kendy was on a vacation, I concentrated on making the patches better (the-that-time-open-ones: AreaPropertyPanel and LinePropertyPanel) + debugged some code around toolbarmanager.cxx to start with the next task. + After the above three mentioned panels are completed and pushed successfully, I'll be starting with the next task- 'Individual setting of visibility of text-descriptions of toolbar buttons'. Time permitting, I'll be reading some code around it this weekend and start with the actual next task from upcoming Monday. Not to forget, thanks Kendy for all the help and guidance! [1] AreaPropertyPanel : https://gerrit.libreoffice.org/#/c/4402/ [2] PosSizePropertyPanel: https://gerrit.libreoffice.org/#/c/4837/ [3] InsertPropertyPanel :https://gerrit.libreoffice.org/#/c/4881/ Thanks and Regards, Prashant Pandey IRC-elixir On Mon, Jul 1, 2013 at 2:20 PM, Prashant Pandey wrote: > Hello everyone, > > Continuing to my last week's work of panels conversion to .ui, here's an > update of last week's progress. > The further panels upon which I was working were much more difficult than > the previous ones and needed much more attention, which was unfortunately > not expected by me. I got stuck while their conversion and finally the got > acquainted that the problem was some issue with Resource Id's. > Nevertheless, one more patch for ParaPropertyPanel has been pushed > successfully and the further work is currently in progress. > > This week, I'd be making my patches of AreaPropertyPanel and > LinePropertyPanel as perfect as possible + time permitting working on some > more panels! > > Thanks and Regards, > Prashant > > On Fri, Jun 21, 2013 at 10:45 PM, Prashant Pandey < > prashant3.yi...@gmail.com> wrote: > >> Hello everyone, >> >> I am working on LibreOffice's UI part to improve toolbars. The work >> commenced by the Conversion of sidebar panels to .ui definition, with the >> help of glade. >> >> Since I never dealt with 'Glade', my first on-hand experience started >> with learning glade. In the mean time I could learn and prepare the designs >> for some sidebars, Kendy provided me a wonderful >> tutorial to get started with the coding part too, which could empower me to >> opportunely complete the sidebar conversions for the following panels: >> NumberFormatPropertyPanel [1], CellAppearancePropertyPanel [2] and >> PagePropertyPanel [3]. I am glad to announce that these changes have been >> prosperously pushed to master in the first week. >> >> On the present scale, we are finished with 'Calc' (on the part of .ui >> panel conversions) and I am currently working on 'Writer'. Around 3 further >> changes (for writer) are pushed to gerrit and the work is still in >> progress. Hopefully I'll be done with all the required leftover sidebar >> conversions, by the end of next week/weekend. >> >> [1] >> http://cgit.freedesktop.org/libreoffice/core/commit/?id=782adaed6342ceb798c52cff9c47a6dd8c1c2d72 >> [2] >> http://cgit.freedesktop.org/libreoffice/core/commit/?id=637334cb6fdce9d5ee08f8c9fd9f964ccbb56403 >> [3] >> http://cgit.freedesktop.org/libreoffice/core/commit/?id=0813006e76880e78200cad47baefb5b70d9b21e8 >> >> Thanks and Regards, >> Prashant Pandey >> IRC- elixir >> > > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/vlc' - avmedia/source
avmedia/source/vlc/vlcplayer.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit e963770ca687b9761b8bc803cb13e57e2afc3085
Author: Minh Ngo
Date: Sat Jul 13 10:34:42 2013 +0300
Fixing volume changing ability
Change-Id: Ie6b175fd039a868a57afdfe7bd05a2de69c39a7c
diff --git a/avmedia/source/vlc/vlcplayer.cxx b/avmedia/source/vlc/vlcplayer.cxx
index 0a15a72..d94206c 100644
--- a/avmedia/source/vlc/vlcplayer.cxx
+++ b/avmedia/source/vlc/vlcplayer.cxx
@@ -96,13 +96,13 @@ void SAL_CALL VLCPlayer::setPlaybackLoop( ::sal_Bool bSet )
void SAL_CALL VLCPlayer::setVolumeDB( ::sal_Int16 nDB )
{
::osl::MutexGuard aGuard(m_aMutex);
-libvlc_audio_set_volume( mPlayer.get(), nDB );
+libvlc_audio_set_volume( mPlayer.get(), static_cast( ( nDB + 40
) * 10.0 / 4 ) );
}
::sal_Int16 SAL_CALL VLCPlayer::getVolumeDB()
{
::osl::MutexGuard aGuard(m_aMutex);
-return libvlc_audio_get_volume( mPlayer.get() );
+return static_cast( libvlc_audio_get_volume( mPlayer.get() ) /
10.0 * 4 - 40 );
}
void SAL_CALL VLCPlayer::setMute( ::sal_Bool bSet )
@@ -168,7 +168,7 @@ uno::Reference< css::media::XPlayerWindow > SAL_CALL
VLCPlayer::createPlayerWind
uno::Reference< css::media::XFrameGrabber > SAL_CALL
VLCPlayer::createFrameGrabber()
{
::osl::MutexGuard aGuard(m_aMutex);
-return uno::Reference< css::media::XFrameGrabber >(new VLCFrameGrabber());
+return uno::Reference< css::media::XFrameGrabber >( new VLCFrameGrabber()
);
}
::rtl::OUString SAL_CALL VLCPlayer::getImplementationName()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[GSOC] iOS remote control weekly update 5 (workable milestone)
Hello all, This week I've had some important progresses that I would like to share with you! I'm copying this to the QA mailing list as I've promised to let you know once this app is ready for tests. What have been done during the last week: - the app handles server connection more smoothly, it is now a two step procedure (connection with a timeout of 3 secs and if connected, another 5 secs are allowed to wait for the initial pairing instruction sent from server) as I notice that on Windows the initial pairing message from server comes significantly slower than on Mac OS or Linux. - slide show preview page now provides two user options: 1. auto-start timer, 2. touch pointer. - Touch pointer means that users can touch the enlarged image directly and we will track the movement and send the coordinates to the server accordingly. This is much easier to code, more reliable to use for now and I will use this mode for server-end hacking. - accelerometer based pointer is still in its infancy, I've implemented an experimental version and it's not really usable for now (it reflects approximately where you point at if you calibrate the phone in the right way and don't move your phone... ). I've discussed this issue with Norbert Thiebaud and Andrzej J.R. Hunt and received some nice tips but I would rather save that at the end when everything else is ready as it's quite a crazy idea to implement xD - And finally, the app has been updated to be stay compatible with iOS5 onwards! What I'll be working on next week: - Fix the bug that I've discussed with Andrzej, that is, if the computer is connected to an external display, the currentSlideshow number sent initially would be most of the time 0 instead the real slidenumber (if we starts the slideshow from the middle for ex.). - Implement the pointer feature on the server end & discuss with Artur in order to stay in consistency with the android app. - eventually other bug fixes & bonjour service implementation on the server A final word: if you have an iOS device (for now it's iPhone only but it also works on iPad in a much smaller way :-P), feel free to do some test and let me know if any bugs&suggestions. Also, should I publish this version on the app store so that people don't have to compile it? Or export it to an ipa file? That's it for now, Cheers, Siqi - -- Cordialement, Siqi LIU Étudiant Ingérieur, Université de Technologie de Compiègne Vice-Président de l'association robotique UTCoupe Responsable d'atelier de ClubChine -- Tel. +33 7 61 16 95 83 email: m...@siqi.fr -- ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
